diff --git a/[refs] b/[refs] index d87a880d9a23..0905325e4888 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be6e518b625a90e84d26371f722474e239c01e4c +refs/heads/master: b887d3f2c63543dce1a0825e41be3a8d3ebef78d diff --git a/trunk/include/asm-mips/io.h b/trunk/include/asm-mips/io.h index a9fa1254894a..05de7c174e67 100644 --- a/trunk/include/asm-mips/io.h +++ b/trunk/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; \