Merge branch 'akpm' (Andrew's patch-bomb)

[~andy/linux] / drivers / of / platform.c

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 63b3ec48c203a43f3d8a9d395e459d765fd7f7b0..20fbebd49db348f6c61ed13a038335b748629495 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -55,7 +55,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
 #include <asm/dcr.h>
 #endif
 
-#if !defined(CONFIG_SPARC)
+#ifdef CONFIG_OF_ADDRESS
 /*
  * The following routines scan a subtree and registers a device for
  * each applicable node.
@@ -462,4 +462,4 @@ int of_platform_populate(struct device_node *root,
        of_node_put(root);
        return rc;
 }
-#endif /* !CONFIG_SPARC */
+#endif /* CONFIG_OF_ADDRESS */