diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /include/asm-mips/vga.h | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-mips/vga.h')
| -rw-r--r-- | include/asm-mips/vga.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-mips/vga.h b/include/asm-mips/vga.h index ca5cec97e167..34755c0a6398 100644 --- a/include/asm-mips/vga.h +++ b/include/asm-mips/vga.h | |||
| @@ -26,6 +26,9 @@ | |||
| 26 | * <linux/vt_buffer.h> has already done the right job for us. | 26 | * <linux/vt_buffer.h> has already done the right job for us. |
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #undef scr_writew | ||
| 30 | #undef scr_readw | ||
| 31 | |||
| 29 | static inline void scr_writew(u16 val, volatile u16 *addr) | 32 | static inline void scr_writew(u16 val, volatile u16 *addr) |
| 30 | { | 33 | { |
| 31 | *addr = cpu_to_le16(val); | 34 | *addr = cpu_to_le16(val); |