diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /arch/mips/include/asm/vga.h | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'arch/mips/include/asm/vga.h')
| -rw-r--r-- | arch/mips/include/asm/vga.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/vga.h b/arch/mips/include/asm/vga.h index f4cff7e4fa8a..f82c83749a08 100644 --- a/arch/mips/include/asm/vga.h +++ b/arch/mips/include/asm/vga.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #ifndef _ASM_VGA_H | 6 | #ifndef _ASM_VGA_H |
| 7 | #define _ASM_VGA_H | 7 | #define _ASM_VGA_H |
| 8 | 8 | ||
| 9 | #include <asm/addrspace.h> | ||
| 9 | #include <asm/byteorder.h> | 10 | #include <asm/byteorder.h> |
| 10 | 11 | ||
| 11 | /* | 12 | /* |
| @@ -13,7 +14,7 @@ | |||
| 13 | * access the videoram directly without any black magic. | 14 | * access the videoram directly without any black magic. |
| 14 | */ | 15 | */ |
| 15 | 16 | ||
| 16 | #define VGA_MAP_MEM(x, s) (0xb0000000L + (unsigned long)(x)) | 17 | #define VGA_MAP_MEM(x, s) CKSEG1ADDR(0x10000000L + (unsigned long)(x)) |
| 17 | 18 | ||
| 18 | #define vga_readb(x) (*(x)) | 19 | #define vga_readb(x) (*(x)) |
| 19 | #define vga_writeb(x, y) (*(y) = (x)) | 20 | #define vga_writeb(x, y) (*(y) = (x)) |