Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

2006-02-08 09:58:27 -08:00
parent 423ab71a8b b887d3f2c6
commit f564c5fe29
13 changed files with 215 additions and 78 deletions
--- 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;							\