vserver 1.9.5.x5

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

diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h
index c94b789..fbea8be 100644 (file)
--- a/include/asm-arm/arch-integrator/io.h
+++ b/include/asm-arm/arch-integrator/io.h
@@ -22,8 +22,8 @@
 
 #define IO_SPACE_LIMIT 0xffff
 
-#define __io(a)                        (PCI_IO_VADDR + (a))
-#define __mem_pci(a)           ((unsigned long)(a))
-#define __mem_isa(a)           (PCI_MEMORY_VADDR + (unsigned long)(a))
+#define __io(a)                        ((void __iomem *)(PCI_IO_VADDR + (a)))
+#define __mem_pci(a)           (a)
+#define __mem_isa(a)           ((a) + PCI_MEMORY_VADDR)
 
 #endif