diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap4panda.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index e944025d5ef8..fca5b9e80c18 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
@@ -76,11 +76,10 @@ static struct platform_device *panda_devices[] __initdata = { | |||
76 | &leds_gpio, | 76 | &leds_gpio, |
77 | }; | 77 | }; |
78 | 78 | ||
79 | static void __init omap4_panda_init_irq(void) | 79 | static void __init omap4_panda_init_early(void) |
80 | { | 80 | { |
81 | omap2_init_common_infrastructure(); | 81 | omap2_init_common_infrastructure(); |
82 | omap2_init_common_devices(NULL, NULL); | 82 | omap2_init_common_devices(NULL, NULL); |
83 | gic_init_irq(); | ||
84 | } | 83 | } |
85 | 84 | ||
86 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | 85 | static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { |
@@ -424,7 +423,8 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board") | |||
424 | .boot_params = 0x80000100, | 423 | .boot_params = 0x80000100, |
425 | .reserve = omap_reserve, | 424 | .reserve = omap_reserve, |
426 | .map_io = omap4_panda_map_io, | 425 | .map_io = omap4_panda_map_io, |
427 | .init_irq = omap4_panda_init_irq, | 426 | .init_early = omap4_panda_init_early, |
427 | .init_irq = gic_init_irq, | ||
428 | .init_machine = omap4_panda_init, | 428 | .init_machine = omap4_panda_init, |
429 | .timer = &omap_timer, | 429 | .timer = &omap_timer, |
430 | MACHINE_END | 430 | MACHINE_END |