diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
| commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
| tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /include/asm-alpha/vga.h | |
| parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) | |
Merge with Linux 2.2.8.
Diffstat (limited to 'include/asm-alpha/vga.h')
| -rw-r--r-- | include/asm-alpha/vga.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-alpha/vga.h b/include/asm-alpha/vga.h index 733fe41c7..7e66f50d3 100644 --- a/include/asm-alpha/vga.h +++ b/include/asm-alpha/vga.h @@ -21,7 +21,7 @@ extern inline void scr_writew(u16 val, u16 *addr) writew(val, (unsigned long) addr); } -extern inline u16 scr_readw(u16 *addr) +extern inline u16 scr_readw(const u16 *addr) { if ((long) addr < 0) return *addr; @@ -37,12 +37,12 @@ extern inline void scr_memsetw(u16 *s, u16 c, unsigned int count) memsetw_io(s, c, count); } -extern inline void scr_memcpyw_from(u16 *d, u16 *s, unsigned int 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, u16 *s, unsigned int count) +extern inline void scr_memcpyw_to(u16 *d, const u16 *s, unsigned int count) { memcpy_toio(d, s, count); } |