Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[linux-2.6.git] / arch / arm / mach-kirkwood / pcie.c

diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index 8def894f32968f1936386bc1f3b2b7b0e142508f..a066a6d8d9d2126bc577401b8710e16a1b40d133 100644 (file)
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -11,7 +11,6 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/mbus.h>
 #include <video/vga.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
@@ -199,9 +198,8 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
        if (request_resource(&iomem_resource, &pp->res[1]))
                panic("Request PCIe%d Memory resource failed\n", index);
 
-       sys->resource[0] = &pp->res[0];
-       sys->resource[1] = &pp->res[1];
-       sys->resource[2] = NULL;
+       pci_add_resource(&sys->resources, &pp->res[0]);
+       pci_add_resource(&sys->resources, &pp->res[1]);
        sys->io_offset = 0;
 
        /*
@@ -209,7 +207,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys)
         */
        orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 
-       orion_pcie_setup(pp->base, &orion_mbus_dram_info);
+       orion_pcie_setup(pp->base);
 
        return 1;
 }
@@ -237,7 +235,8 @@ kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys)
        struct pci_bus *bus;
 
        if (nr < num_pcie_ports) {
-               bus = pci_scan_bus(sys->busnr, &pcie_ops, sys);
+               bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
+                                       &sys->resources);
        } else {
                bus = NULL;
                BUG();