diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 22:22:40 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 12:19:29 -0400 |
commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-integrator/pci_v3.c | |
parent | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff) |
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.c | 2 |
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 11b86e5b71c2..dd56bfb351e3 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
30 | #include <video/vga.h> | ||
30 | 31 | ||
31 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
32 | #include <mach/platform.h> | 33 | #include <mach/platform.h> |
@@ -504,6 +505,7 @@ void __init pci_v3_preinit(void) | |||
504 | 505 | ||
505 | pcibios_min_io = 0x6000; | 506 | pcibios_min_io = 0x6000; |
506 | pcibios_min_mem = 0x00100000; | 507 | pcibios_min_mem = 0x00100000; |
508 | vga_base = PCI_MEMORY_VADDR; | ||
507 | 509 | ||
508 | /* | 510 | /* |
509 | * Hook in our fault handler for PCI errors | 511 | * Hook in our fault handler for PCI errors |