Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 44x / katmai.c

diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c
index fd737d10f6e4c50fa14daba4b014a7566107825c..44f4b3a00cedee98206e2e1ec563a31de564d590 100644 (file)
--- a/arch/powerpc/platforms/44x/katmai.c
+++ b/arch/powerpc/platforms/44x/katmai.c
@@ -21,10 +21,10 @@
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
 
-#include "44x.h"
-
-static struct of_device_id katmai_of_bus[] = {
+static __initdata struct of_device_id katmai_of_bus[] = {
        { .compatible = "ibm,plb4", },
        { .compatible = "ibm,opb", },
        { .compatible = "ibm,ebc", },
@@ -33,14 +33,11 @@ static struct of_device_id katmai_of_bus[] = {
 
 static int __init katmai_device_probe(void)
 {
-       if (!machine_is(katmai))
-               return 0;
-
        of_platform_bus_probe(NULL, katmai_of_bus, NULL);
 
        return 0;
 }
-device_initcall(katmai_device_probe);
+machine_device_initcall(katmai, katmai_device_probe);
 
 static int __init katmai_probe(void)
 {
@@ -49,6 +46,8 @@ static int __init katmai_probe(void)
        if (!of_flat_dt_is_compatible(root, "amcc,katmai"))
                return 0;
 
+       ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+
        return 1;
 }
 
@@ -58,6 +57,6 @@ define_machine(katmai) {
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
-       .restart                        = ppc44x_reset_system,
+       .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
 };