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/include/asm/vga.h | |
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/include/asm/vga.h')
-rw-r--r-- | arch/arm/include/asm/vga.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h index 250a4dd00630..91f40217bfa5 100644 --- a/arch/arm/include/asm/vga.h +++ b/arch/arm/include/asm/vga.h | |||
@@ -2,9 +2,10 @@ | |||
2 | #define ASMARM_VGA_H | 2 | #define ASMARM_VGA_H |
3 | 3 | ||
4 | #include <linux/io.h> | 4 | #include <linux/io.h> |
5 | #include <mach/hardware.h> | ||
6 | 5 | ||
7 | #define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) | 6 | extern unsigned long vga_base; |
7 | |||
8 | #define VGA_MAP_MEM(x,s) (vga_base + (x)) | ||
8 | 9 | ||
9 | #define vga_readb(x) (*((volatile unsigned char *)x)) | 10 | #define vga_readb(x) (*((volatile unsigned char *)x)) |
10 | #define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x)) | 11 | #define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x)) |