diff --git a/[refs] b/[refs]
index bea27c844947..6d29eece7b24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b736c860dd93ba26b391abc91891e03ca99858
+refs/heads/master: 110957f0e521c8d14f97bbe955af2fa17bb720bf
diff --git a/trunk/include/asm-parisc/io.h b/trunk/include/asm-parisc/io.h
index b9bb5946ecc9..0db00adc942a 100644
--- a/trunk/include/asm-parisc/io.h
+++ b/trunk/include/asm-parisc/io.h
@@ -41,7 +41,7 @@ extern void __raw_bad_addr(const volatile void __iomem *addr);
 #define __raw_check_addr(addr)					\
 	if (((unsigned long)addr >> NYBBLE_SHIFT) != 0xe)	\
 		__raw_bad_addr(addr);			\
-	addr = (void *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT));
+	addr = (void __iomem *)((unsigned long)addr | (0xfUL << NYBBLE_SHIFT));
 #else
 #define gsc_check_addr(addr)
 #define __raw_check_addr(addr)