[POWERPC] 4xx: Mark of_bus structures as __initdata

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

diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c
index 9bc45de..d27f758 100644 (file)
--- a/arch/powerpc/platforms/44x/bamboo.c
+++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -14,15 +14,18 @@
  * option) any later version.
  */
 #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 <asm/pci-bridge.h>
+
 #include "44x.h"
 
-static struct of_device_id bamboo_of_bus[] = {
+static __initdata struct of_device_id bamboo_of_bus[] = {
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
@@ -47,17 +50,14 @@ static int __init bamboo_probe(void)
        if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
                return 0;
 
-       return 1;
-}
+       ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
 
-static void __init bamboo_setup_arch(void)
-{
+       return 1;
 }
 
 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,