diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-13 20:50:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-12-13 20:50:01 -0800 |
| commit | 31373a87190ccffbb9b8ee46952b9a17fb0da312 (patch) | |
| tree | 6bc2de4bbaef0e80038655c63dbd1fdbbcdbef15 /include | |
| parent | 1de32ed1a82c9b013e0aaefa06bcb205bef59fef (diff) | |
| parent | 0f0a76beccddabadf33878f1a0b42620febd1d71 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/io.h b/include/asm-i386/io.h index 7b27cf130b1a..479e976ed86c 100644 --- a/include/asm-i386/io.h +++ b/include/asm-i386/io.h @@ -184,7 +184,7 @@ static inline void memset_io(volatile void __iomem *addr, unsigned char val, int { memset((void __force *) addr, val, count); } -static inline void memcpy_fromio(void *dst, volatile void __iomem *src, int count) +static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count) { __memcpy(dst, (void __force *) src, count); } |