summaryrefslogtreecommitdiffstats
path: root/include/asm-alpha/vga.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-04 07:40:19 +0000
commit33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch)
tree2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /include/asm-alpha/vga.h
parent216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff)
Merge with Linux 2.3.32.
Diffstat (limited to 'include/asm-alpha/vga.h')
-rw-r--r--include/asm-alpha/vga.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/include/asm-alpha/vga.h b/include/asm-alpha/vga.h
index 17e164742..44b6abcc0 100644
--- a/include/asm-alpha/vga.h
+++ b/include/asm-alpha/vga.h
@@ -11,6 +11,7 @@
#define VT_BUF_HAVE_RW
#define VT_BUF_HAVE_MEMSETW
+#define VT_BUF_HAVE_MEMCPYW
#define VT_BUF_HAVE_MEMCPYF
extern inline void scr_writew(u16 val, u16 *addr)
@@ -37,15 +38,10 @@ extern inline void scr_memsetw(u16 *s, u16 c, unsigned int count)
memsetw(s, c, count);
}
-extern inline void scr_memcpyw_from(u16 *d, const u16 *s, unsigned int count)
-{
- memcpy_fromio(d, s, count);
-}
-
-extern inline void scr_memcpyw_to(u16 *d, const u16 *s, unsigned int count)
-{
- memcpy_toio(d, s, count);
-}
+/* Do not trust that the usage will be correct; analyze the arguments. */
+extern void scr_memcpyw(u16 *d, const u16 *s, unsigned int count);
+#define scr_memcpyw_from scr_memcpyw
+#define scr_memcpyw_to scr_memcpyw
/* ??? These are currently only used for downloading character sets. As
such, they don't need memory barriers. Is this all they are intended