diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-28 21:22:40 -0500 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-07-12 11:19:29 -0500 |
| commit | cc22b4c18540e5e8bf55c7d124044f9317527d3c (patch) | |
| tree | 77b9980c1824fd389105efe7e7f9693c9c258ad9 /arch/arm/mach-shark | |
| parent | c9d95fbe59e426eed7f16e7cac812e46ac4772d0 (diff) | |
| download | linux-stable-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.gz linux-stable-cc22b4c18540e5e8bf55c7d124044f9317527d3c.tar.bz2 linux-stable-cc22b4c18540e5e8bf55c7d124044f9317527d3c.zip | |
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-shark')
| -rw-r--r-- | arch/arm/mach-shark/include/mach/hardware.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shark/pci.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shark/include/mach/hardware.h b/arch/arm/mach-shark/include/mach/hardware.h index 4342931a1502..663f952a8ab3 100644 --- a/arch/arm/mach-shark/include/mach/hardware.h +++ b/arch/arm/mach-shark/include/mach/hardware.h @@ -12,7 +12,5 @@ #define UNCACHEABLE_ADDR 0xdf010000 -#define PCIMEM_BASE 0xe8000000 - #endif diff --git a/arch/arm/mach-shark/pci.c b/arch/arm/mach-shark/pci.c index 4aea637a2ddb..92d7227de0ac 100644 --- a/arch/arm/mach-shark/pci.c +++ b/arch/arm/mach-shark/pci.c @@ -8,6 +8,7 @@ #include <linux/kernel.h> #include <linux/pci.h> #include <linux/init.h> +#include <video/vga.h> #include <asm/irq.h> #include <asm/mach/pci.h> @@ -42,6 +43,7 @@ static int __init shark_pci_init(void) pcibios_min_io = 0x6000; pcibios_min_mem = 0x50000000; + vga_base = 0xe8000000; pci_common_init(&shark_pci); |