diff --git a/[refs] b/[refs]
index 9ebaa7e0d974..c456eb29926e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 854a68521badc48460c9cbcdf37b220865836ac3
+refs/heads/master: e66d3c490c7a45daa49c1ae9cc5fe0687d14b823
diff --git a/trunk/include/asm-generic/io.h b/trunk/include/asm-generic/io.h
index 912088773a69..c2cf2eda0626 100644
--- a/trunk/include/asm-generic/io.h
+++ b/trunk/include/asm-generic/io.h
@@ -327,7 +327,7 @@ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 #define ioremap_wc ioremap_nocache
 #endif
 
-static inline void iounmap(void *addr)
+static inline void iounmap(void __iomem *addr)
 {
 }
 #endif /* CONFIG_MMU */