---

yaml --- r: 58868 b: refs/heads/master c: c0cf500 h: refs/heads/master v: v3
git-mirror · Jul 12, 2007 · 87f9d00 · 87f9d00
1 parent 0ddeb10
commit 87f9d00
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);