diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 04:52:20 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-30 04:52:20 -0400 |
| commit | c2d9b8387bce8b4a0fd402fab7dc1319d11a418d (patch) | |
| tree | 082cf7dd287f61635198011e61c3de1be130cc42 /include/asm-ia64/vga.h | |
| parent | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'include/asm-ia64/vga.h')
| -rw-r--r-- | include/asm-ia64/vga.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-ia64/vga.h b/include/asm-ia64/vga.h index 1f446d6841f6..bc3349ffc505 100644 --- a/include/asm-ia64/vga.h +++ b/include/asm-ia64/vga.h | |||
| @@ -14,7 +14,10 @@ | |||
| 14 | * videoram directly without any black magic. | 14 | * videoram directly without any black magic. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #define VGA_MAP_MEM(x) ((unsigned long) ioremap((x), 0)) | 17 | extern unsigned long vga_console_iobase; |
| 18 | extern unsigned long vga_console_membase; | ||
| 19 | |||
| 20 | #define VGA_MAP_MEM(x) ((unsigned long) ioremap(vga_console_membase + (x), 0)) | ||
| 18 | 21 | ||
| 19 | #define vga_readb(x) (*(x)) | 22 | #define vga_readb(x) (*(x)) |
| 20 | #define vga_writeb(x,y) (*(y) = (x)) | 23 | #define vga_writeb(x,y) (*(y) = (x)) |