diff --git a/[refs] b/[refs]
index 9d174615ade1..1f01ce7e8d9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb1dddd73dfd35d4f8669c4b849ce33483950237
+refs/heads/master: d0a84e72eb755f58ba350d9988bfbdffd6f5a22c
diff --git a/trunk/arch/arm/mach-rpc/include/mach/hardware.h b/trunk/arch/arm/mach-rpc/include/mach/hardware.h
index dde6b3c0e299..822b810215d7 100644
--- a/trunk/arch/arm/mach-rpc/include/mach/hardware.h
+++ b/trunk/arch/arm/mach-rpc/include/mach/hardware.h
@@ -51,12 +51,12 @@
 /*
  * IO Addresses
  */
-#define VIDC_BASE		IOMEM(0xe0400000)
-#define EXPMASK_BASE		0xe0360000
-#define IOMD_BASE		IOMEM(0xe0200000)
-#define IOC_BASE		IOMEM(0xe0200000)
-#define PCIO_BASE		IOMEM(0xe0010000)
-#define FLOPPYDMA_BASE		IOMEM(0xe002a000)
+#define VIDC_BASE		(IO_BASE + 0x00400000)
+#define EXPMASK_BASE		(IO_BASE + 0x00360000)
+#define IOMD_BASE		(IO_BASE + 0x00200000)
+#define IOC_BASE		(IO_BASE + 0x00200000)
+#define FLOPPYDMA_BASE		(IO_BASE + 0x0002a000)
+#define PCIO_BASE		(IO_BASE + 0x00010000)
 
 #define vidc_writel(val)	__raw_writel(val, VIDC_BASE)