diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
commit | f9baa031dd6bedc6d4b39e254e3b76cd2c37769b (patch) | |
tree | 216e51a0dc73b76f8e7be6648ecf4ee7dbbceec1 /arch/arm/mach-omap1/board-sx1.c | |
parent | 21ee0ab5fa80eb7307079e1a126f642fe7a937a6 (diff) | |
parent | d21872b3683ff37f73c68993749a6e6aeeaed265 (diff) |
Merge commit 'd21872b'linaro_merge_100811
Diffstat (limited to 'arch/arm/mach-omap1/board-sx1.c')
-rw-r--r-- | arch/arm/mach-omap1/board-sx1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 995566b862b..2eb148b8de9 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@ -392,7 +392,7 @@ static void __init omap_sx1_init(void) omap_board_config_size = ARRAY_SIZE(sx1_config); omap_serial_init(); omap_register_i2c_bus(1, 100, NULL, 0); - omap_usb_init(&sx1_usb_config); + omap1_usb_init(&sx1_usb_config); sx1_mmc_init(); /* turn on USB power */ |