diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-14 11:53:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-15 14:00:58 -0400 |
commit | cbff67668d597da48f8bc48549a9630cbf968f34 (patch) | |
tree | 526c38fc97aba41653e2ee0914dfb8abee9ad4dc /include | |
parent | 6ce6b3aeeae75eee34670bcd42870ac839bfec4c (diff) |
[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')
-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 @@ | |||
4 | #ifndef __SUN3_MMU_H__ | 4 | #ifndef __SUN3_MMU_H__ |
5 | #define __SUN3_MMU_H__ | 5 | #define __SUN3_MMU_H__ |
6 | 6 | ||
7 | #include <linux/types.h> | ||
7 | #include <asm/movs.h> | 8 | #include <asm/movs.h> |
8 | #include <asm/sun3-head.h> | 9 | #include <asm/sun3-head.h> |
9 | 10 | ||
@@ -160,7 +161,7 @@ static inline void sun3_put_context(unsigned char c) | |||
160 | return; | 161 | return; |
161 | } | 162 | } |
162 | 163 | ||
163 | extern void *sun3_ioremap(unsigned long phys, unsigned long size, | 164 | extern void __iomem *sun3_ioremap(unsigned long phys, unsigned long size, |
164 | unsigned long type); | 165 | unsigned long type); |
165 | 166 | ||
166 | extern int sun3_map_test(unsigned long addr, char *val); | 167 | extern int sun3_map_test(unsigned long addr, char *val); |