diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
tree | e01a457a4912a8553bc65524aa3125d51f29f810 /include/asm-alpha/core_t2.h | |
parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) |
Merge with Linux 2.2.1.
Diffstat (limited to 'include/asm-alpha/core_t2.h')
-rw-r--r-- | include/asm-alpha/core_t2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-alpha/core_t2.h b/include/asm-alpha/core_t2.h index 1f0984b38..fdb0f82fe 100644 --- a/include/asm-alpha/core_t2.h +++ b/include/asm-alpha/core_t2.h @@ -378,7 +378,7 @@ __EXTERN_INLINE unsigned int t2_inw(unsigned long addr) __EXTERN_INLINE void t2_outw(unsigned short b, unsigned long addr) { - unsigned int w; + unsigned long w; w = __kernel_inswl(b, addr & 3); *(vuip) ((addr << 5) + T2_IO + 0x08) = w; |