diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2012-11-23 12:36:06 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2012-11-23 12:36:06 -1000
commit5e351cdc998db82935d1248a053a1be37d1160fd (patch)
parenta0543d64388146f83ff7aef4abb42f8fd074d5e0 (diff)
parent0e622d39197f0b64b9e043fe75ac3634bf9f3a05 (diff)
Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6
Pull device tree regression fix from Grant Likely: "Simple build regression fix for DT device drivers on Sparc. An earlier change had masked out the of_iomap() helper on SPARC." * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6: of/address: sparc: Declare of_iomap as an extern function for sparc again
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/prom.h b/arch/sparc/include/asm/prom.h
index f93003123bce..67c62578d170 100644
--- a/arch/sparc/include/asm/prom.h
+++ b/arch/sparc/include/asm/prom.h
@@ -63,10 +63,13 @@ extern char *of_console_options;
extern void irq_trans_init(struct device_node *dp);
extern char *build_path_component(struct device_node *dp);
-/* SPARC has a local implementation */
+/* SPARC has local implementations */
extern int of_address_to_resource(struct device_node *dev, int index,
struct resource *r);
#define of_address_to_resource of_address_to_resource
+void __iomem *of_iomap(struct device_node *node, int index);
+#define of_iomap of_iomap
#endif /* __KERNEL__ */
#endif /* _SPARC_PROM_H */
diff --git a/include/linux/of_address.h b/include/linux/of_address.h
index e20e3af68fb6..0506eb53519b 100644
--- a/include/linux/of_address.h
+++ b/include/linux/of_address.h
@@ -42,10 +42,12 @@ static inline struct device_node *of_find_matching_node_by_address(
return NULL;
+#ifndef of_iomap
static inline void __iomem *of_iomap(struct device_node *device, int index)
return NULL;
static inline const __be32 *of_get_address(struct device_node *dev, int index,
u64 *size, unsigned int *flags)