diff --git a/[refs] b/[refs] index 40794118ce38..39f261453542 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59f145d28ce853b13dafdfab438c48f3ead0b38e +refs/heads/master: 99289a4e8a9cb3fa6caa8fc4ebf57a33db497340 diff --git a/trunk/include/asm-mips/io.h b/trunk/include/asm-mips/io.h index 3061870b7f6c..d42685747e7d 100644 --- a/trunk/include/asm-mips/io.h +++ b/trunk/include/asm-mips/io.h @@ -459,10 +459,10 @@ __BUILDIO(q, u64) #define __BUILD_MEMORY_STRING(bwlq, type) \ \ -static inline void writes##bwlq(volatile void __iomem *mem, void *addr, \ - unsigned int count) \ +static inline void writes##bwlq(volatile void __iomem *mem, \ + const void *addr, unsigned int count) \ { \ - volatile type *__addr = addr; \ + const volatile type *__addr = addr; \ \ while (count--) { \ mem_write##bwlq(*__addr, mem); \