summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/io.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 09:58:27 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 09:58:27 -0800
commitf564c5fe29d3fa9adc6d839714521b0554c62598 (patch)
treed112824129cd01ee05acce915b32477718a62312 /include/asm-mips/io.h
parent423ab71a8bd2345f87724abe320092a3a516b0bb (diff)
parentb887d3f2c63543dce1a0825e41be3a8d3ebef78d (diff)
downloadop-kernel-dev-f564c5fe29d3fa9adc6d839714521b0554c62598.zip
op-kernel-dev-f564c5fe29d3fa9adc6d839714521b0554c62598.tar.gz
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h
index 6c0aae5..5a4c8a5 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, \
BUG(); \
} \
\
-static inline type pfx##read##bwlq(volatile void __iomem *mem) \
+static inline type pfx##read##bwlq(const volatile void __iomem *mem) \
{ \
volatile type *__mem; \
type __val; \
OpenPOWER on IntegriCloud