diff --git a/[refs] b/[refs]
index 5b9da4b8d940..2cf0d4eaf8cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9815778ae016004c33ce267a00b7d567192ef6e7
+refs/heads/master: c0cf500145b4154adcbc55afc1a63db24cee84a2
diff --git a/trunk/include/asm-mips/io.h b/trunk/include/asm-mips/io.h
index 12bcc1f9fba9..7ba92890ea13 100644
--- a/trunk/include/asm-mips/io.h
+++ b/trunk/include/asm-mips/io.h
@@ -212,7 +212,8 @@ static inline void __iomem * __ioremap_mode(phys_t offset, unsigned long size,
 		 */
 		if (__IS_LOW512(phys_addr) && __IS_LOW512(last_addr) &&
 		    flags == _CACHE_UNCACHED)
-			return (void __iomem *)CKSEG1ADDR(phys_addr);
+			return (void __iomem *)
+				(unsigned long)CKSEG1ADDR(phys_addr);
 	}
 
 	return __ioremap(offset, size, flags);