diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 12:58:27 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 12:58:27 -0500 |
| commit | f564c5fe29d3fa9adc6d839714521b0554c62598 (patch) | |
| tree | d112824129cd01ee05acce915b32477718a62312 /include/asm-mips/io.h | |
| parent | 423ab71a8bd2345f87724abe320092a3a516b0bb (diff) | |
| parent | b887d3f2c63543dce1a0825e41be3a8d3ebef78d (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'include/asm-mips/io.h')
| -rw-r--r-- | include/asm-mips/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index 6c0aae5151a6..5a4c8a54b8f4 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h | |||
| @@ -342,7 +342,7 @@ static inline void pfx##write##bwlq(type val, \ | |||
| 342 | BUG(); \ | 342 | BUG(); \ |
| 343 | } \ | 343 | } \ |
| 344 | \ | 344 | \ |
| 345 | static inline type pfx##read##bwlq(volatile void __iomem *mem) \ | 345 | static inline type pfx##read##bwlq(const volatile void __iomem *mem) \ |
| 346 | { \ | 346 | { \ |
| 347 | volatile type *__mem; \ | 347 | volatile type *__mem; \ |
| 348 | type __val; \ | 348 | type __val; \ |