Merge git://git.infradead.org/users/dwmw2/random-2.6

[linux-2.6] / include / asm-arm / arch-realview / hardware.h

diff --git a/include/asm-arm/arch-realview/hardware.h b/include/asm-arm/arch-realview/hardware.h
index bad8d7ce9bfe480e30b69c15dbfc75dfaf489cd0..1ee8313ceb6a98d485558178fe78c0a3c31f7ce3 100644 (file)
--- a/include/asm-arm/arch-realview/hardware.h
+++ b/include/asm-arm/arch-realview/hardware.h
@@ -25,7 +25,7 @@
 #include <asm/sizes.h>
 
 /* macro to get at IO space when running virtually */
-#define IO_ADDRESS(x)          ((((x) & 0x0effffff) | (((x) >> 4) & 0x0f000000)) + 0xf0000000)
+#define IO_ADDRESS(x)          (((x) & 0x0fffffff) + 0xf0000000)
 #define __io_address(n)                __io(IO_ADDRESS(n))
 
 #endif