diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-14 17:53:38 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-15 20:00:58 +0200 |
commit | cbff67668d597da48f8bc48549a9630cbf968f34 (patch) | |
tree | 526c38fc97aba41653e2ee0914dfb8abee9ad4dc /include/asm-m68k | |
parent | [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user ... (diff) | |
download | linux-cbff67668d597da48f8bc48549a9630cbf968f34.tar.xz linux-cbff67668d597da48f8bc48549a9630cbf968f34.zip |
[PATCH] sun3_ioremap() prototype
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/sun3mmu.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |