diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3logic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 9 | 
1 files changed, 5 insertions, 4 deletions
| diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 15e4b08e99ba..b726943d7c93 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -195,11 +195,10 @@ static inline void __init board_smsc911x_init(void)  	gpmc_smsc911x_init(&board_smsc911x_data);  } -static void __init omap3logic_init_irq(void) +static void __init omap3logic_init_early(void)  {  	omap2_init_common_infrastructure();  	omap2_init_common_devices(NULL, NULL); -	omap_init_irq();  }  #ifdef CONFIG_OMAP_MUX @@ -225,7 +224,8 @@ static void __init omap3logic_init(void)  MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")  	.boot_params	= 0x80000100,  	.map_io		= omap3_map_io, -	.init_irq	= omap3logic_init_irq, +	.init_early	= omap3logic_init_early, +	.init_irq	= omap_init_irq,  	.init_machine	= omap3logic_init,  	.timer		= &omap_timer,  MACHINE_END @@ -233,7 +233,8 @@ MACHINE_END  MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")  	.boot_params	= 0x80000100,  	.map_io		= omap3_map_io, -	.init_irq	= omap3logic_init_irq, +	.init_early	= omap3logic_init_early, +	.init_irq	= omap_init_irq,  	.init_machine	= omap3logic_init,  	.timer		= &omap_timer,  MACHINE_END |