Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer...

[linux-2.6] / arch / powerpc / platforms / 44x / ebony.c

diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index ad526eafc90b813d3fa2231566abdd999f994d6f..6cd3476767cc3b8583332dd8e351166ebc761d97 100644 (file)
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -17,19 +17,20 @@
  */
 
 #include <linux/init.h>
+#include <linux/of_platform.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 "44x.h"
 
 static struct of_device_id ebony_of_bus[] = {
-       { .type = "ibm,plb", },
-       { .type = "ibm,opb", },
-       { .type = "ibm,ebc", },
+       { .compatible = "ibm,plb4", },
+       { .compatible = "ibm,opb", },
+       { .compatible = "ibm,ebc", },
        {},
 };
 
@@ -57,14 +58,9 @@ static int __init ebony_probe(void)
        return 1;
 }
 
-static void __init ebony_setup_arch(void)
-{
-}
-
 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,