diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 18:10:13 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-18 18:10:13 +0200 |
| commit | ef4669db0c9d5f06d5fd169fa461289723a93a91 (patch) | |
| tree | b77ea6e73205326295566d896eda1e2df59383a6 /arch/arm/mach-mv78xx0/pcie.c | |
| parent | 0bf6b1da1a53e8414d954251b1d13e2cdbd499b4 (diff) | |
| parent | cc22b4c18540e5e8bf55c7d124044f9317527d3c (diff) | |
Merge branch 'next/cross-platform' into for-next
Diffstat (limited to 'arch/arm/mach-mv78xx0/pcie.c')
| -rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index a560439dcc3..445a332325d 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c @@ -11,6 +11,7 @@ #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> @@ -297,6 +298,8 @@ static void __init add_pcie_port(int maj, int min, unsigned long base) void __init mv78xx0_pcie_init(int init_port0, int init_port1) { + vga_base = MV78XX0_PCIE_MEM_PHYS_BASE; + if (init_port0) { add_pcie_port(0, 0, PCIE00_VIRT_BASE); if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { |