Merge branch 'linus' into core/rcu

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 83xx / mpc834x_mds.c

diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 459fb7227e764ce71a539209287819b0c238181f..fc3f2ed1f3e927c722d5243956c6304fe6940f91 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -35,6 +35,7 @@
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
 
 #include "mpc83xx.h"
 
@@ -110,18 +111,16 @@ static void __init mpc834x_mds_init_IRQ(void)
 static struct of_device_id mpc834x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        {},
 };
 
 static int __init mpc834x_declare_of_platform_devices(void)
 {
-       if (!machine_is(mpc834x_mds))
-               return 0;
-
        of_platform_bus_probe(NULL, mpc834x_ids, NULL);
        return 0;
 }
-device_initcall(mpc834x_declare_of_platform_devices);
+machine_device_initcall(mpc834x_mds, mpc834x_declare_of_platform_devices);
 
 /*
  * Called very early, MMU is off, device-tree isn't unflattened