fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-m68k / sun3mmu.h

diff --git a/include/asm-m68k/sun3mmu.h b/include/asm-m68k/sun3mmu.h
index 4867b69..d8f17a0 100644 (file)
--- 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>
 
@@ -144,7 +145,7 @@ static inline unsigned char sun3_get_context(void)
        SET_SFC(FC_CONTROL);
        GET_CONTROL_BYTE(AC_CONTEXT, c);
        SET_SFC(sfc);
-       
+
        return c;
 }
 
@@ -156,11 +157,11 @@ static inline void sun3_put_context(unsigned char c)
        SET_DFC(FC_CONTROL);
        SET_CONTROL_BYTE(AC_CONTEXT, c);
        SET_DFC(dfc);
-       
+
        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);