aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/board-zoom.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom.c')
-rw-r--r--arch/arm/mach-omap2/board-zoom.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c
index 569526456420..d56c79661038 100644
--- a/arch/arm/mach-omap2/board-zoom.c
+++ b/arch/arm/mach-omap2/board-zoom.c
@@ -34,11 +34,6 @@
34 34
35#define ZOOM3_EHCI_RESET_GPIO 64 35#define ZOOM3_EHCI_RESET_GPIO 64
36 36
37static void __init omap_zoom_init_early(void)
38{
39 omap2_init_common_infrastructure();
40}
41
42#ifdef CONFIG_OMAP_MUX 37#ifdef CONFIG_OMAP_MUX
43static struct omap_board_mux board_mux[] __initdata = { 38static struct omap_board_mux board_mux[] __initdata = {
44 /* WLAN IRQ - GPIO 162 */ 39 /* WLAN IRQ - GPIO 162 */
@@ -138,7 +133,7 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
138 .boot_params = 0x80000100, 133 .boot_params = 0x80000100,
139 .reserve = omap_reserve, 134 .reserve = omap_reserve,
140 .map_io = omap3_map_io, 135 .map_io = omap3_map_io,
141 .init_early = omap_zoom_init_early, 136 .init_early = omap3430_init_early,
142 .init_irq = omap3_init_irq, 137 .init_irq = omap3_init_irq,
143 .init_machine = omap_zoom_init, 138 .init_machine = omap_zoom_init,
144 .timer = &omap3_timer, 139 .timer = &omap3_timer,
@@ -148,7 +143,7 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
148 .boot_params = 0x80000100, 143 .boot_params = 0x80000100,
149 .reserve = omap_reserve, 144 .reserve = omap_reserve,
150 .map_io = omap3_map_io, 145 .map_io = omap3_map_io,
151 .init_early = omap_zoom_init_early, 146 .init_early = omap3630_init_early,
152 .init_irq = omap3_init_irq, 147 .init_irq = omap3_init_irq,
153 .init_machine = omap_zoom_init, 148 .init_machine = omap_zoom_init,
154 .timer = &omap3_timer, 149 .timer = &omap3_timer,