diff options
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
-rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 5d12fd35681b..3daf87ad2576 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c | |||
@@ -422,13 +422,13 @@ static void __init innovator_init(void) | |||
422 | 422 | ||
423 | #ifdef CONFIG_ARCH_OMAP15XX | 423 | #ifdef CONFIG_ARCH_OMAP15XX |
424 | if (cpu_is_omap1510()) { | 424 | if (cpu_is_omap1510()) { |
425 | omap_usb_init(&innovator1510_usb_config); | 425 | omap1_usb_init(&innovator1510_usb_config); |
426 | innovator_config[1].data = &innovator1510_lcd_config; | 426 | innovator_config[1].data = &innovator1510_lcd_config; |
427 | } | 427 | } |
428 | #endif | 428 | #endif |
429 | #ifdef CONFIG_ARCH_OMAP16XX | 429 | #ifdef CONFIG_ARCH_OMAP16XX |
430 | if (cpu_is_omap1610()) { | 430 | if (cpu_is_omap1610()) { |
431 | omap_usb_init(&h2_usb_config); | 431 | omap1_usb_init(&h2_usb_config); |
432 | innovator_config[1].data = &innovator1610_lcd_config; | 432 | innovator_config[1].data = &innovator1610_lcd_config; |
433 | } | 433 | } |
434 | #endif | 434 | #endif |
@@ -463,6 +463,7 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator") | |||
463 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, | 463 | .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, |
464 | .boot_params = 0x10000100, | 464 | .boot_params = 0x10000100, |
465 | .map_io = innovator_map_io, | 465 | .map_io = innovator_map_io, |
466 | .reserve = omap_reserve, | ||
466 | .init_irq = innovator_init_irq, | 467 | .init_irq = innovator_init_irq, |
467 | .init_machine = innovator_init, | 468 | .init_machine = innovator_init, |
468 | .timer = &omap_timer, | 469 | .timer = &omap_timer, |