From: Al Viro <viro@ftp.linux.org.uk>
Date: Sat, 14 Oct 2006 15:53:38 +0000 (+0100)
Subject: [PATCH] sun3_ioremap() prototype
X-Git-Tag: MMI-PSA29.97-13-9~46045
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cbff67668d597da48f8bc48549a9630cbf968f34;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[PATCH] sun3_ioremap() prototype

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-m68k/sun3mmu.h b/include/asm-m68k/sun3mmu.h
index 6c8c17d047a1..d8f17a0d8c9f 100644
--- a/include/asm-m68k/sun3mmu.h
+++ b/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);