From a0988f8490b219a28ffad7c41b75b7dcd6a8e4d7 Mon Sep 17 00:00:00 2001
From: Mark Salter <msalter@redhat.com>
Date: Tue, 4 Oct 2011 09:25:56 -0400
Subject: [PATCH] --- yaml --- r: 283171 b: refs/heads/master c:
 e66d3c490c7a45daa49c1ae9cc5fe0687d14b823 h: refs/heads/master i:   283169:
 3abd2d4bb4794ff71ff72d953039bf9c351ef1aa   283167:
 883015a29cf4f51a352b7a669896bf41b4b17d51 v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-generic/io.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 */