diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-rm680.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rm680.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-rm680.c b/arch/arm/mach-omap2/board-rm680.c index a6f76e13c15b..a3182e846b14 100644 --- a/arch/arm/mach-omap2/board-rm680.c +++ b/arch/arm/mach-omap2/board-rm680.c | |||
@@ -123,11 +123,6 @@ static void __init rm680_peripherals_init(void) | |||
123 | omap2_hsmmc_init(mmc); | 123 | omap2_hsmmc_init(mmc); |
124 | } | 124 | } |
125 | 125 | ||
126 | static void __init rm680_init_early(void) | ||
127 | { | ||
128 | omap2_init_common_infrastructure(); | ||
129 | } | ||
130 | |||
131 | #ifdef CONFIG_OMAP_MUX | 126 | #ifdef CONFIG_OMAP_MUX |
132 | static struct omap_board_mux board_mux[] __initdata = { | 127 | static struct omap_board_mux board_mux[] __initdata = { |
133 | { .reg_offset = OMAP_MUX_TERMINATOR }, | 128 | { .reg_offset = OMAP_MUX_TERMINATOR }, |
@@ -158,7 +153,7 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board") | |||
158 | .boot_params = 0x80000100, | 153 | .boot_params = 0x80000100, |
159 | .reserve = omap_reserve, | 154 | .reserve = omap_reserve, |
160 | .map_io = rm680_map_io, | 155 | .map_io = rm680_map_io, |
161 | .init_early = rm680_init_early, | 156 | .init_early = omap3630_init_early, |
162 | .init_irq = omap3_init_irq, | 157 | .init_irq = omap3_init_irq, |
163 | .init_machine = rm680_init, | 158 | .init_machine = rm680_init, |
164 | .timer = &omap3_timer, | 159 | .timer = &omap3_timer, |