Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6

torvalds · torvalds · commit 5e351cdc998d · 2012-11-23T12:36:06.000-10:00
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
diff --git 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
@@ -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;
 }
+#endif
 static inline const __be32 *of_get_address(struct device_node *dev, int index,
 					u64 *size, unsigned int *flags)
 {

Original file line number	Diff line number	Diff line change
`@@ -42,10 +42,12 @@ static inline struct device_node *of_find_matching_node_by_address(`
`42`	`42`	`{`
`43`	`43`	`return NULL;`
`44`	`44`	`}`
	`45`	`+#ifndef of_iomap`
`45`	`46`	`static inline void __iomem of_iomap(struct device_node device, int index)`
`46`	`47`	`{`
`47`	`48`	`return NULL;`
`48`	`49`	`}`
	`50`	`+#endif`
`49`	`51`	`static inline const __be32 of_get_address(struct device_node dev, int index,`
`50`	`52`	`u64 size, unsigned int flags)`
`51`	`53`	`{`