From 6b0be6feb6ab67c77ab7d5c46d583b130ac27f15 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 14 Oct 2006 16:53:38 +0100
Subject: [PATCH] --- yaml --- r: 39563 b: refs/heads/master c:
 cbff67668d597da48f8bc48549a9630cbf968f34 h: refs/heads/master i:   39561:
 0503636e23322a862c2a6c385e36360fe890e8a7   39559:
 3e8262b2ce5c3c3682a084c764a70962768445cf v: v3

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

diff --git a/[refs] b/[refs]
index 2d5b2bb9f6f4..fba9c707b393 100644
--- 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
index 6c8c17d047a1..d8f17a0d8c9f 100644
--- 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);