Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im into devel

[mirror_ubuntu-zesty-kernel.git] / arch / arm / mach-versatile / include / mach / io.h

diff --git a/arch/arm/mach-versatile/include/mach/io.h b/arch/arm/mach-versatile/include/mach/io.h
index c0b9dd1d025759a4d893fefc9ac73c065aa57523..f067c14c7182982850e2179adc94b4298185d866 100644 (file)
--- a/arch/arm/mach-versatile/include/mach/io.h
+++ b/arch/arm/mach-versatile/include/mach/io.h
@@ -22,11 +22,7 @@
 
 #define IO_SPACE_LIMIT 0xffffffff
 
-static inline void __iomem *__io(unsigned long addr)
-{
-       return (void __iomem *)addr;
-}
-#define __io(a)        __io(a)
-#define __mem_pci(a)           (a)
+#define __io(a)                __typesafe_io(a)
+#define __mem_pci(a)   (a)
 
 #endif