diff --git a/[refs] b/[refs]
index b7123b75ab87..525693e7a0c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 365f7a43497dfdfdc05ca03896a8e22ee6944179
+refs/heads/master: 5d57795e26c413656725c26bd053dbee3711adee
diff --git a/trunk/arch/arm/mach-realview/include/mach/hardware.h b/trunk/arch/arm/mach-realview/include/mach/hardware.h
index b42c14f89acb..8a638d15797f 100644
--- a/trunk/arch/arm/mach-realview/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-realview/include/mach/hardware.h
@@ -25,6 +25,7 @@
 #include <asm/sizes.h>
 
 /* macro to get at IO space when running virtually */
+#ifdef CONFIG_MMU
 /*
  * Statically mapped addresses:
  *
@@ -33,6 +34,9 @@
  * 1fxx xxxx -> fexx xxxx
  */
 #define IO_ADDRESS(x)		(((x) & 0x03ffffff) + 0xfb000000)
+#else
+#define IO_ADDRESS(x)		(x)
+#endif
 #define __io_address(n)		__io(IO_ADDRESS(n))
 
 #endif