diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
| commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
| tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /include/asm-alpha/vga.h | |
| parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) | |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'include/asm-alpha/vga.h')
| -rw-r--r-- | include/asm-alpha/vga.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-alpha/vga.h b/include/asm-alpha/vga.h index 44b6abcc0..4fc557ca1 100644 --- a/include/asm-alpha/vga.h +++ b/include/asm-alpha/vga.h @@ -14,7 +14,7 @@ #define VT_BUF_HAVE_MEMCPYW #define VT_BUF_HAVE_MEMCPYF -extern inline void scr_writew(u16 val, u16 *addr) +extern inline void scr_writew(u16 val, volatile u16 *addr) { if (__is_ioaddr((unsigned long) addr)) __raw_writew(val, (unsigned long) addr); @@ -22,7 +22,7 @@ extern inline void scr_writew(u16 val, u16 *addr) *addr = val; } -extern inline u16 scr_readw(const u16 *addr) +extern inline u16 scr_readw(volatile const u16 *addr) { if (__is_ioaddr((unsigned long) addr)) return __raw_readw((unsigned long) addr); |