Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...

[sfrench/cifs-2.6.git] / arch / arm / mach-omap1 / board-osk.c

diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e2a72af30890bbd54850257c3d82df1e5e38339f..679740cc1e9020e8ea0200524215c31f92827178 100644 (file)
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -560,7 +560,7 @@ static void __init osk_init(void)
        l |= (3 << 1);
        omap_writel(l, USB_TRANSCEIVER_CTRL);
 
-       omap_usb_init(&osk_usb_config);
+       omap1_usb_init(&osk_usb_config);
 
        /* irq for tps65010 chip */
        /* bootloader effectively does:  omap_cfg_reg(U19_1610_MPUIO1); */