summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2005-09-26 07:19:28 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-27 03:29:50 +0200
commit24558a0f7a00fccd19a6e6502956463f056ce90e (patch)
tree45d150a4e1855a19f1c575719d266112789f9451
parent[PATCH] useless includes of linux/irq.h in arch/i386 (diff)
downloadlinux-24558a0f7a00fccd19a6e6502956463f056ce90e.tar.xz
linux-24558a0f7a00fccd19a6e6502956463f056ce90e.zip
[PATCH] m32r: missing __iomem in ioremap() declaration
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/asm-m32r/io.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/io.h b/include/asm-m32r/io.h
index 8e9e481e6996..70ad1c949c2b 100644
--- a/include/asm-m32r/io.h
+++ b/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);
}