Merge branch 'cleanups' into next

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 44x / bamboo.c

diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c
index d27f758d9cb2338c9c567d108b4f95a318c5d5e6..fb9a22a7e8d085c18dc5ada58067207541947b57 100644 (file)
--- a/arch/powerpc/platforms/44x/bamboo.c
+++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -34,14 +34,11 @@ static __initdata struct of_device_id bamboo_of_bus[] = {
 
 static int __init bamboo_device_probe(void)
 {
-       if (!machine_is(bamboo))
-               return 0;
-
        of_platform_bus_probe(NULL, bamboo_of_bus, NULL);
 
        return 0;
 }
-device_initcall(bamboo_device_probe);
+machine_device_initcall(bamboo, bamboo_device_probe);
 
 static int __init bamboo_probe(void)
 {