summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-integrator/pci_v3.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2011-06-28 21:22:40 -0500
committerRob Herring <rob.herring@calxeda.com>2011-07-12 11:19:29 -0500
commitcc22b4c18540e5e8bf55c7d124044f9317527d3c (patch)
tree77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-integrator/pci_v3.c
parentc9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff)
downloadop-kernel-dev-cc22b4c18540e5e8bf55c7d124044f9317527d3c.zip
op-kernel-dev-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.gz
ARM: set vga memory base at run-time
Convert the incorrectly named PCIMEM_BASE to a variable called vga_base. This removes the dependency on mach/hardware.h. Signed-off-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-integrator/pci_v3.c')
-rw-r--r--arch/arm/mach-integrator/pci_v3.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c
index 11b86e5..dd56bfb 100644
--- a/arch/arm/mach-integrator/pci_v3.c
+++ b/arch/arm/mach-integrator/pci_v3.c
@@ -27,6 +27,7 @@
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/io.h>
+#include <video/vga.h>
#include <mach/hardware.h>
#include <mach/platform.h>
@@ -504,6 +505,7 @@ void __init pci_v3_preinit(void)
pcibios_min_io = 0x6000;
pcibios_min_mem = 0x00100000;
+ vga_base = PCI_MEMORY_VADDR;
/*
* Hook in our fault handler for PCI errors
OpenPOWER on IntegriCloud