Merge branch 'akpm' (patches from Andrew Morton) into next

[cascardo/linux.git] / include / linux / of_irq.h

diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 6404253..bfec136 100644 (file)
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -45,6 +45,7 @@ extern void of_irq_init(const struct of_device_id *matches);
 #ifdef CONFIG_OF_IRQ
 extern int of_irq_count(struct device_node *dev);
 extern int of_irq_get(struct device_node *dev, int index);
+extern int of_irq_get_byname(struct device_node *dev, const char *name);
 #else
 static inline int of_irq_count(struct device_node *dev)
 {
@@ -54,6 +55,10 @@ static inline int of_irq_get(struct device_node *dev, int index)
 {
        return 0;
 }
+static inline int of_irq_get_byname(struct device_node *dev, const char *name)
+{
+       return 0;
+}
 #endif
 
 #if defined(CONFIG_OF)