---

yaml --- r: 9303 b: refs/heads/master c: 24558a0 h: refs/heads/master i: 9301: b8863cc 9299: 145d560 9295: e4a486b v: v3
git-mirror · Sep 27, 2005 · 7e8a0a7 · 7e8a0a7
1 parent 6e1babc
commit 7e8a0a7
Show file tree

Hide file tree

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