From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 11 Apr 2012 05:05:53 +0000 (+1000)
Subject: Revert "of/irq: add empty irq_of_parse_and_map() for non-dt builds"
X-Git-Tag: next-20120411~1
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;ds=sidebyside;h=57942ad0cbfb051a8c38541c3d42721f2aa0f599;p=karo-tx-linux.git

Revert "of/irq: add empty irq_of_parse_and_map() for non-dt builds"

This reverts commit e46c11b947876235f18d137b051225cfbe7099f2.
---

diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h
index 11d57e4a7bfb..d229ad3edee0 100644
--- a/include/linux/of_irq.h
+++ b/include/linux/of_irq.h
@@ -10,14 +10,14 @@ struct of_irq;
 #include <linux/ioport.h>
 #include <linux/of.h>
 
-#if defined(CONFIG_OF_IRQ)
 /*
- * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
+ * irq_of_parse_and_map() is used ba all OF enabled platforms; but SPARC
  * implements it differently.  However, the prototype is the same for all,
  * so declare it here regardless of the CONFIG_OF_IRQ setting.
  */
 extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
 
+#if defined(CONFIG_OF_IRQ)
 /**
  * of_irq - container for device_node/irq_specifier pair for an irq controller
  * @controller: pointer to interrupt controller device tree node
@@ -76,11 +76,5 @@ extern struct device_node *of_irq_find_parent(struct device_node *child);
 extern void of_irq_init(const struct of_device_id *matches);
 
 #endif /* CONFIG_OF_IRQ */
-#else /* CONFIG_OF */
-static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
-						int index)
-{
-	return 0;
-}
 #endif /* CONFIG_OF */
 #endif /* __OF_IRQ_H */