Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/include/asm-arm/arch-sa1100/io.h b/include/asm-arm/arch-sa1100/io.h
index c7dea80..040ccde 100644 (file)
--- a/include/asm-arm/arch-sa1100/io.h
+++ b/include/asm-arm/arch-sa1100/io.h
@@ -16,8 +16,12 @@
  * We don't actually have real ISA nor PCI buses, but there is so many 
  * drivers out there that might just work if we fake them...
  */
-#define __io(a)                        (PCIO_BASE + (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)
+#define __mem_isa(a)           (a)
 
 #endif