diff --git a/[refs] b/[refs]
index aa038b1ce459..9920706b2ea8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 595c050d89e91e91cca3845e48b01042677bd19e
+refs/heads/master: fbeeea5386ab213bd55b223f3a75c823fccd6df5
diff --git a/trunk/arch/arm/mach-ep93xx/core.c b/trunk/arch/arm/mach-ep93xx/core.c
index 4c38941a92c7..b390c35f8bc1 100644
--- a/trunk/arch/arm/mach-ep93xx/core.c
+++ b/trunk/arch/arm/mach-ep93xx/core.c
@@ -377,7 +377,7 @@ void __init ep93xx_init_irq(void)
  */
 static DEFINE_SPINLOCK(syscon_swlock);
 
-void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg)
+void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg)
 {
 	unsigned long flags;
 
diff --git a/trunk/arch/arm/mach-ep93xx/include/mach/platform.h b/trunk/arch/arm/mach-ep93xx/include/mach/platform.h
index fb5e59a3ea04..0af0a3ba7047 100644
--- a/trunk/arch/arm/mach-ep93xx/include/mach/platform.h
+++ b/trunk/arch/arm/mach-ep93xx/include/mach/platform.h
@@ -17,7 +17,7 @@ void ep93xx_init_irq(void);
 void ep93xx_init_time(unsigned long);
 
 /* EP93xx System Controller software locked register write */
-void ep93xx_syscon_swlocked_write(unsigned int val, unsigned int reg);
+void ep93xx_syscon_swlocked_write(unsigned int val, void __iomem *reg);
 void ep93xx_devcfg_set_clear(unsigned int set_bits, unsigned int clear_bits);
 
 static inline void ep93xx_devcfg_set_bits(unsigned int bits)