diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-03-08 16:04:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-03-09 18:05:10 +0000 |
| commit | fd2a4f1183d1e6802457d70cea067396236ed64b (patch) | |
| tree | 144fa623d9935bd67c63b71078eb35d1109d7dfb /include | |
| parent | 1443e483e34d2ead97215bd8496b34b0d3fbc2c0 (diff) | |
[MIPS] Undefine scr_writew and scr_readw in <asm/vga.h>.
This is gluing the build of cirrusfb but really the mess that would need
cleaning and fixing is <video/vga.h> and <linux/vt_buffer.h> ...
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include')
| -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 ca5cec97e16..34755c0a639 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); |