diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /include/asm-x86/vga.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'include/asm-x86/vga.h')
| -rw-r--r-- | include/asm-x86/vga.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/vga.h b/include/asm-x86/vga.h index 0ccf804377e6..b9e493d07d07 100644 --- a/include/asm-x86/vga.h +++ b/include/asm-x86/vga.h | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | * (c) 1998 Martin Mares <mj@ucw.cz> | 4 | * (c) 1998 Martin Mares <mj@ucw.cz> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #ifndef _LINUX_ASM_VGA_H_ | 7 | #ifndef ASM_X86__VGA_H |
| 8 | #define _LINUX_ASM_VGA_H_ | 8 | #define ASM_X86__VGA_H |
| 9 | 9 | ||
| 10 | /* | 10 | /* |
| 11 | * On the PC, we can just recalculate addresses and then | 11 | * On the PC, we can just recalculate addresses and then |
| @@ -17,4 +17,4 @@ | |||
| 17 | #define vga_readb(x) (*(x)) | 17 | #define vga_readb(x) (*(x)) |
| 18 | #define vga_writeb(x, y) (*(y) = (x)) | 18 | #define vga_writeb(x, y) (*(y) = (x)) |
| 19 | 19 | ||
| 20 | #endif | 20 | #endif /* ASM_X86__VGA_H */ |