---

yaml --- r: 39563 b: refs/heads/master c: cbff676 h: refs/heads/master i: 39561: 0503636 39559: 3e8262b v: v3
git-mirror · Oct 15, 2006 · 6b0be6f · 6b0be6f
1 parent 84d64c6
commit 6b0be6f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce6b3aeeae75eee34670bcd42870ac839bfec4c
+refs/heads/master: cbff67668d597da48f8bc48549a9630cbf968f34
diff --git a/trunk/include/asm-m68k/sun3mmu.h b/trunk/include/asm-m68k/sun3mmu.h
@@ -4,6 +4,7 @@
 #ifndef __SUN3_MMU_H__
 #define __SUN3_MMU_H__
 
+#include <linux/types.h>
 #include <asm/movs.h>
 #include <asm/sun3-head.h>
 
@@ -160,7 +161,7 @@ static inline void sun3_put_context(unsigned char c)
 	return;
 }
 
-extern void *sun3_ioremap(unsigned long phys, unsigned long size,
+extern void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
 			  unsigned long type);
 
 extern int sun3_map_test(unsigned long addr, char *val);