Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[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 5522f1f9642e00be3a96a18f97127f0f64835ddc..470e1a3fd755cced07b812f6507908daab22fcd1 100644 (file)
--- a/arch/powerpc/platforms/44x/bamboo.c
+++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -23,7 +23,7 @@
 #include "44x.h"
 
 static struct of_device_id bamboo_of_bus[] = {
-       { .compatible = "ibm,plb", },
+       { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
        {},
@@ -50,14 +50,9 @@ static int __init bamboo_probe(void)
        return 1;
 }
 
-static void __init bamboo_setup_arch(void)
-{
-}
-
 define_machine(bamboo) {
        .name                           = "Bamboo",
        .probe                          = bamboo_probe,
-       .setup_arch             = bamboo_setup_arch,
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,