Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

[pandora-kernel.git] / arch / arm / plat-mxc / ehci.c

diff --git a/arch/arm/plat-mxc/ehci.c b/arch/arm/plat-mxc/ehci.c
index 35a064f..9915607 100644 (file)
--- a/arch/arm/plat-mxc/ehci.c
+++ b/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);