1 files changed, 3 insertions, 14 deletions

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 3863a4dbdf1..5a6f458a4bb 100644
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -12,6 +12,7 @@
  */
 
 #ifdef CONFIG_OF_DEVICE
+#include <linux/module.h>
 #include <linux/device.h>
 #include <linux/mod_devicetable.h>
 #include <linux/pm.h>
@@ -81,7 +82,7 @@ extern struct platform_device *of_device_alloc(struct device_node *np,
                                          struct device *parent);
 extern struct platform_device *of_find_device_by_node(struct device_node *np);
 
-#ifdef CONFIG_OF_ADDRESS /* device reg helpers depend on OF_ADDRESS */
+#if !defined(CONFIG_SPARC) /* SPARC has its own device registration method */
 /* Platform devices and busses creation */
 extern struct platform_device *of_platform_device_create(struct device_node *np,
                                                    const char *bus_id,
@@ -94,20 +95,8 @@ extern int of_platform_populate(struct device_node *root,
                                 const struct of_device_id *matches,
                                 const struct of_dev_auxdata *lookup,
                                 struct device *parent);
-#endif /* CONFIG_OF_ADDRESS */
+#endif /* !CONFIG_SPARC */
 
 #endif /* CONFIG_OF_DEVICE */
 
-#if !defined(CONFIG_OF_ADDRESS)
-struct of_dev_auxdata;
-struct device;
-static inline int of_platform_populate(struct device_node *root,
-                                        const struct of_device_id *matches,
-                                        const struct of_dev_auxdata *lookup,
-                                        struct device *parent)
-{
-        return -ENODEV;
-}
-#endif /* !CONFIG_OF_ADDRESS */
-
 #endif  /* _LINUX_OF_PLATFORM_H */