diff --git a/[refs] b/[refs]
index 0ea1a7934f28..79994d32ca87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 556cbdbf23fb43433dba9657ad194a36be18f81b
+refs/heads/master: a060656240af125b22b1c011944377ff4216ac3e
diff --git a/trunk/arch/arm/plat-mxc/ehci.c b/trunk/arch/arm/plat-mxc/ehci.c
index 35a064ff02ba..9915607683de 100644
--- a/trunk/arch/arm/plat-mxc/ehci.c
+++ b/trunk/arch/arm/plat-mxc/ehci.c
@@ -249,8 +249,8 @@ int mxc_initialize_usb_hw(int port, unsigned int flags)
 #ifdef CONFIG_ARCH_MX51
 	if (cpu_is_mx51()) {
 		void __iomem *usb_base;
-		u32 usbotg_base;
-		u32 usbother_base;
+		void __iomem *usbotg_base;
+		void __iomem *usbother_base;
 		int ret = 0;
 
 		usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);