diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-13 19:35:03 -0800 |
| commit | 2da994e687f7991cc76e3270c423bf6500b9424a (patch) | |
| tree | 437d685035c2a39395f14c233831422ed636c016 /arch/arm/mach-orion5x/pci.c | |
| parent | 00e929808a1cb410f45a620c0fc79d8d0a2506b1 (diff) | |
| parent | db33f4de9952af112b0d4f2436ce931ae632aba0 (diff) | |
Merge branch 'orion/devel' into next/devel
Diffstat (limited to 'arch/arm/mach-orion5x/pci.c')
| -rw-r--r-- | arch/arm/mach-orion5x/pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index bc4a920e26ee..a494c470e3e4 100644 --- a/arch/arm/mach-orion5x/pci.c +++ b/arch/arm/mach-orion5x/pci.c @@ -18,6 +18,7 @@ #include <asm/irq.h> #include <asm/mach/pci.h> #include <plat/pcie.h> +#include <plat/addr-map.h> #include "common.h" /***************************************************************************** @@ -145,7 +146,7 @@ static int __init pcie_setup(struct pci_sys_data *sys) /* * Generic PCIe unit setup. */ - orion_pcie_setup(PCIE_BASE, &orion5x_mbus_dram_info); + orion_pcie_setup(PCIE_BASE); /* * Check whether to apply Orion-1/Orion-NAS PCIe config @@ -477,7 +478,7 @@ static int __init pci_setup(struct pci_sys_data *sys) /* * Point PCI unit MBUS decode windows to DRAM space. */ - orion5x_setup_pci_wins(&orion5x_mbus_dram_info); + orion5x_setup_pci_wins(&orion_mbus_dram_info); /* * Master + Slave enable |