---

yaml --- r: 20947 b: refs/heads/master c: fd2a4f1 h: refs/heads/master i: 20945: 4316ca7 20943: 5059052 v: v3
git-mirror · Mar 9, 2006 · 2299e61 · 2299e61
1 parent 15bee92
commit 2299e61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1443e483e34d2ead97215bd8496b34b0d3fbc2c0
+refs/heads/master: fd2a4f1183d1e6802457d70cea067396236ed64b
diff --git a/trunk/include/asm-mips/vga.h b/trunk/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);