aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-ldp.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-ldp.c')
-rw-r--r--arch/arm/mach-omap2/board-ldp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index e5dc74875f9d..d8eb2cb7cbc7 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -288,13 +288,12 @@ static struct omap_board_config_kernel ldp_config[] __initdata = {
288 { OMAP_TAG_LCD, &ldp_lcd_config }, 288 { OMAP_TAG_LCD, &ldp_lcd_config },
289}; 289};
290 290
291static void __init omap_ldp_init_irq(void) 291static void __init omap_ldp_init_early(void)
292{ 292{
293 omap_board_config = ldp_config; 293 omap_board_config = ldp_config;
294 omap_board_config_size = ARRAY_SIZE(ldp_config); 294 omap_board_config_size = ARRAY_SIZE(ldp_config);
295 omap2_init_common_infrastructure(); 295 omap2_init_common_infrastructure();
296 omap2_init_common_devices(NULL, NULL); 296 omap2_init_common_devices(NULL, NULL);
297 omap_init_irq();
298} 297}
299 298
300static struct twl4030_usb_data ldp_usb_data = { 299static struct twl4030_usb_data ldp_usb_data = {
@@ -443,9 +442,10 @@ static void __init omap_ldp_init(void)
443 442
444MACHINE_START(OMAP_LDP, "OMAP LDP board") 443MACHINE_START(OMAP_LDP, "OMAP LDP board")
445 .boot_params = 0x80000100, 444 .boot_params = 0x80000100,
446 .map_io = omap3_map_io,
447 .reserve = omap_reserve, 445 .reserve = omap_reserve,
448 .init_irq = omap_ldp_init_irq, 446 .map_io = omap3_map_io,
447 .init_early = omap_ldp_init_early,
448 .init_irq = omap_init_irq,
449 .init_machine = omap_ldp_init, 449 .init_machine = omap_ldp_init,
450 .timer = &omap_timer, 450 .timer = &omap_timer,
451MACHINE_END 451MACHINE_END