diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 14:39:08 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2006-03-23 14:39:08 +0000 |
| commit | 74293759002aa7db0179158c20676a034614577b (patch) | |
| tree | 030ef62361042d1a034087ad9a726db3b57bba72 /include/asm-mips/vga.h | |
| parent | bb8047d3540affd6b8c2adac3fe792e07143be0f (diff) | |
| parent | 2e6e33bab6e1996a5dec9108fb467b52b841e7a8 (diff) | |
| download | blackbird-op-linux-74293759002aa7db0179158c20676a034614577b.tar.gz blackbird-op-linux-74293759002aa7db0179158c20676a034614577b.zip | |
Merge branch 'master' of /home/aia21/ntfs-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 @@ * <linux/vt_buffer.h> has already done the right job for us. */ +#undef scr_writew +#undef scr_readw + static inline void scr_writew(u16 val, volatile u16 *addr) { *addr = cpu_to_le16(val); |
