diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-3630sdp.c')
-rw-r--r-- | arch/arm/mach-omap2/board-3630sdp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-3630sdp.c b/arch/arm/mach-omap2/board-3630sdp.c index 62645640f5e4..16538757291a 100644 --- a/arch/arm/mach-omap2/board-3630sdp.c +++ b/arch/arm/mach-omap2/board-3630sdp.c | |||
@@ -69,14 +69,13 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = { | |||
69 | static struct omap_board_config_kernel sdp_config[] __initdata = { | 69 | static struct omap_board_config_kernel sdp_config[] __initdata = { |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static void __init omap_sdp_init_irq(void) | 72 | static void __init omap_sdp_init_early(void) |
73 | { | 73 | { |
74 | omap_board_config = sdp_config; | 74 | omap_board_config = sdp_config; |
75 | omap_board_config_size = ARRAY_SIZE(sdp_config); | 75 | omap_board_config_size = ARRAY_SIZE(sdp_config); |
76 | omap2_init_common_infrastructure(); | 76 | omap2_init_common_infrastructure(); |
77 | omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params, | 77 | omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params, |
78 | h8mbx00u0mer0em_sdrc_params); | 78 | h8mbx00u0mer0em_sdrc_params); |
79 | omap_init_irq(); | ||
80 | } | 79 | } |
81 | 80 | ||
82 | #ifdef CONFIG_OMAP_MUX | 81 | #ifdef CONFIG_OMAP_MUX |
@@ -216,9 +215,10 @@ static void __init omap_sdp_init(void) | |||
216 | 215 | ||
217 | MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") | 216 | MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board") |
218 | .boot_params = 0x80000100, | 217 | .boot_params = 0x80000100, |
219 | .map_io = omap3_map_io, | ||
220 | .reserve = omap_reserve, | 218 | .reserve = omap_reserve, |
221 | .init_irq = omap_sdp_init_irq, | 219 | .map_io = omap3_map_io, |
220 | .init_early = omap_sdp_init_early, | ||
221 | .init_irq = omap_init_irq, | ||
222 | .init_machine = omap_sdp_init, | 222 | .init_machine = omap_sdp_init, |
223 | .timer = &omap_timer, | 223 | .timer = &omap_timer, |
224 | MACHINE_END | 224 | MACHINE_END |