From 7e8a0a77ac3dd4300688936f13781203345cfb74 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Mon, 26 Sep 2005 06:19:28 +0100
Subject: [PATCH] --- yaml --- r: 9303 b: refs/heads/master c:
 24558a0f7a00fccd19a6e6502956463f056ce90e h: refs/heads/master i:   9301:
 b8863ccc8ec8c05ec1f0275952db7d85fae31f7a   9299:
 145d5606a54e0da16842d75f130f05cd3e0ce749   9295:
 e4a486b1e0e7ec8d4f3fc54abd183911f42bdd11 v: v3

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

diff --git a/[refs] b/[refs]
index 4fa975c3f1cf..ed0bd079b403 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce3a161e693388aaa66d43d26156053311a39b7d
+refs/heads/master: 24558a0f7a00fccd19a6e6502956463f056ce90e
diff --git a/trunk/include/asm-m32r/io.h b/trunk/include/asm-m32r/io.h
index 8e9e481e6996..70ad1c949c2b 100644
--- a/trunk/include/asm-m32r/io.h
+++ b/trunk/include/asm-m32r/io.h
@@ -60,7 +60,7 @@ __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
  *	address.
  */
 
-static inline void * ioremap(unsigned long offset, unsigned long size)
+static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
 {
 	return __ioremap(offset, size, 0);
 }