X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-ebsa285%2Fio.h;h=f9c7291418600e6ba59c8078eecc347a87780fbd;hb=refs%2Fremotes%2Fvserver;hp=8511b2ce534f00c3016f62a4a78a4460846c7703;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-arm/arch-ebsa285/io.h b/include/asm-arm/arch-ebsa285/io.h
index 8511b2ce5..f9c729141 100644
--- a/include/asm-arm/arch-ebsa285/io.h
+++ b/include/asm-arm/arch-ebsa285/io.h
@@ -14,30 +14,26 @@
 #ifndef __ASM_ARM_ARCH_IO_H
 #define __ASM_ARM_ARCH_IO_H
 
+#include <asm/hardware.h>
+
 #define IO_SPACE_LIMIT 0xffff
 
 /*
  * Translation of various region addresses to virtual addresses
  */
-#define __io(a)			(PCIO_BASE + (a))
+#define __io(a)			((void __iomem *)(PCIO_BASE + (a)))
 #if 1
-#define __mem_pci(a)		((unsigned long)(a))
-#define __mem_isa(a)		(PCIMEM_BASE + (unsigned long)(a))
+#define __mem_pci(a)		(a)
 #else
 
-static inline unsigned long ___mem_pci(unsigned long a)
+static inline void __iomem *___mem_pci(void __iomem *p)
 {
+	unsigned long a = (unsigned long)p;
 	BUG_ON(a <= 0xc0000000 || a >= 0xe0000000);
-	return a;
+	return p;
 }
 
-static inline unsigned long ___mem_isa(unsigned long a)
-{
-	BUG_ON(a >= 16*1048576);
-	return PCIMEM_BASE + a;
-}
-#define __mem_pci(a)		___mem_pci((unsigned long)(a))
-#define __mem_isa(a)		___mem_isa((unsigned long)(a))
+#define __mem_pci(a)		___mem_pci(a)
 #endif
 
 #endif