]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[MIPS] Undefine scr_writew and scr_readw in <asm/vga.h>.
authorRalf Baechle <ralf@linux-mips.org>
Wed, 8 Mar 2006 16:04:32 +0000 (16:04 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 9 Mar 2006 18:05:10 +0000 (18:05 +0000)
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>
include/asm-mips/vga.h

index ca5cec97e16711a02b5800d18b88fd4b94020b4f..34755c0a63988e21121a33c943fbada2234bb7da 100644 (file)
@@ -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);