]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] sun3_ioremap() prototype
authorAl Viro <viro@ftp.linux.org.uk>
Sat, 14 Oct 2006 15:53:38 +0000 (16:53 +0100)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 15 Oct 2006 18:00:58 +0000 (11:00 -0700)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/asm-m68k/sun3mmu.h

index 6c8c17d047a1a28b9533595991a75d69c92076f3..d8f17a0d8c9f6f872c513b6d5850c98e76d01465 100644 (file)
@@ -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);