diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-18 02:37:08 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-21 02:48:16 (GMT) |
| commit | 65dd4c1626b396af839881708fdf3bc726a16f73 (patch) | |
| tree | 4cd2c12349eb69b4d9797518d20fbd56ba2377f8 /arch/arm/mach-omap1/board-innovator.c | |
| parent | da07c0cff295d887427ad2519e452ee3c27e47ff (diff) | |
| download | linux-65dd4c1626b396af839881708fdf3bc726a16f73.tar.xz | |
omap1: Fix innovator FPGA init for multi-omap
No need to call this early from init_irq. Also recent changes
initialize GPIO now later, so calling gpio_request from init_irq
will make it fail.
While at it, also remove the unnecessary EXPORT_SYMBOL.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-innovator.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-innovator.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index a051acd..8d59b07 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -290,11 +290,6 @@ static void __init innovator_init_irq(void) { omap1_init_common_hw(); omap_init_irq(); -#ifdef CONFIG_ARCH_OMAP15XX - if (cpu_is_omap1510()) { - omap1510_fpga_init_irq(); - } -#endif } #ifdef CONFIG_ARCH_OMAP15XX @@ -385,6 +380,8 @@ static struct omap_board_config_kernel innovator_config[] = { static void __init innovator_init(void) { + if (cpu_is_omap1510()) + omap1510_fpga_init_irq(); innovator_init_smc91x(); #ifdef CONFIG_ARCH_OMAP15XX |