Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / arm / mach-mv78xx0 / pcie.c

diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index c51af1cac30040ee312f6416491c7535cb944d55..12fcb108b0e13036c7de59583e3af5f7e1d99007 100644 (file)
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -10,11 +10,11 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
-#include <linux/mbus.h>
 #include <video/vga.h>
 #include <asm/irq.h>
 #include <asm/mach/pci.h>
 #include <plat/pcie.h>
+#include <plat/addr-map.h>
 #include "common.h"
 
 struct pcie_port {
@@ -153,7 +153,7 @@ static int __init mv78xx0_pcie_setup(int nr, struct pci_sys_data *sys)
         * Generic PCIe unit setup.
         */
        orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
-       orion_pcie_setup(pp->base, &mv78xx0_mbus_dram_info);
+       orion_pcie_setup(pp->base);
 
        sys->resource[0] = &pp->res[0];
        sys->resource[1] = &pp->res[1];