Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / arch / powerpc / platforms / 44x / ebony.c

diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index ad526ea..1a8d467 100644 (file)
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -17,32 +17,33 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_platform.h>
+#include <linux/rtc.h>
+
 #include <asm/machdep.h>
 #include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
-#include <asm/of_platform.h>
+#include <asm/pci-bridge.h>
 
 #include "44x.h"
 
-static struct of_device_id ebony_of_bus[] = {
-       { .type = "ibm,plb", },
-       { .type = "ibm,opb", },
-       { .type = "ibm,ebc", },
+static __initdata struct of_device_id ebony_of_bus[] = {
+       { .compatible = "ibm,plb4", },
+       { .compatible = "ibm,opb", },
+       { .compatible = "ibm,ebc", },
        {},
 };
 
 static int __init ebony_device_probe(void)
 {
-       if (!machine_is(ebony))
-               return 0;
-
        of_platform_bus_probe(NULL, ebony_of_bus, NULL);
+       of_instantiate_rtc();
 
        return 0;
 }
-device_initcall(ebony_device_probe);
+machine_device_initcall(ebony, ebony_device_probe);
 
 /*
  * Called very early, MMU is off, device-tree isn't unflattened
@@ -54,17 +55,14 @@ static int __init ebony_probe(void)
        if (!of_flat_dt_is_compatible(root, "ibm,ebony"))
                return 0;
 
-       return 1;
-}
+       ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
 
-static void __init ebony_setup_arch(void)
-{
+       return 1;
 }
 
 define_machine(ebony) {
        .name                   = "Ebony",
        .probe                  = ebony_probe,
-       .setup_arch             = ebony_setup_arch,
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,