[PATCH v3] of: fix build failure

[Sudip Mukherjee]

We are having build failure with linux-next for sparc allmodconfig with
the error messages:

undefined reference to 'of_io_request_and_map'

CONFIG_OF is defined for sparc so it is expected that we have a
definition of of_io_request_and_map() but of/address.c is only compiled
if it is !SPARC. In other words, CONFIG_OF_ADDRESS is not defined for
sparc so we get the build failure.

Signed-off-by: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx>
---

v1: had a complicated set of #ifdefs
v2: i messed up and resulted in build failure of some other arch where
CONFIG_OF is not defined.
v3: tested with allmodconfig of x86_64, defconfig of alpha and mips.

 include/linux/of_address.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index 507daad..02b1265 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -112,8 +112,6 @@ static inline bool of_dma_is_coherent(struct device_node *np)
 extern int of_address_to_resource(struct device_node *dev, int index,
 				  struct resource *r);
 void __iomem *of_iomap(struct device_node *node, int index);
-void __iomem *of_io_request_and_map(struct device_node *device,
-					int index, const char *name);
 #else
 
 #include <linux/io.h>
@@ -128,13 +126,20 @@ static inline void __iomem *of_iomap(struct device_node *device, int index)
 {
 	return NULL;
 }
+#endif
+
+#ifdef CONFIG_OF_ADDRESS
+void __iomem *of_io_request_and_map(struct device_node *device,
+				    int index, const char *name);
+#else
+#include <linux/io.h>
 
 static inline void __iomem *of_io_request_and_map(struct device_node *device,
-					int index, const char *name)
+						  int index, const char *name)
 {
 	return IOMEM_ERR_PTR(-EINVAL);
 }
-#endif
+#endif /* CONFIG_OF_ADDRESS */
 
 #if defined(CONFIG_OF_ADDRESS) && defined(CONFIG_PCI)
 extern const __be32 *of_get_pci_address(struct device_node *dev, int bar_no,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/