Add changes from the Linux-2.6 tree.

[linux-2.6.git] / include / asm-arm / arch-versatile / io.h

diff --git a/include/asm-arm/arch-versatile/io.h b/include/asm-arm/arch-versatile/io.h
index 542bc6b..c4d0194 100644 (file)
--- a/include/asm-arm/arch-versatile/io.h
+++ b/include/asm-arm/arch-versatile/io.h
@@ -20,10 +20,13 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
-#define IO_SPACE_LIMIT 0xffff
+#define IO_SPACE_LIMIT 0xffffffff
 
-#define __io(a)                        ((a))
-#define __mem_pci(a)           ((unsigned long)(a))
-#define __mem_isa(a)           ((unsigned long)(a))
+static inline void __iomem *__io(unsigned long addr)
+{
+       return (void __iomem *)addr;
+}
+#define __io(a)        __io(a)
+#define __mem_pci(a)           (a)
 
 #endif