diff options
author | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-08-04 07:43:45 -0400 |
commit | 7590d1defdc720a97a9e186f45f529c4ae1b40f7 (patch) | |
tree | e7ffdc043a2847f410d654d8e99e001f3138937a /arch/arm/mach-omap2/board-zoom3.c | |
parent | 7e788b4289bb025a96e327c604cb2db92e17108f (diff) | |
parent | 869fef41547db95df8523bf67845a21313709428 (diff) |
Merge branch 'devel-map-io' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom3.c')
-rw-r--r-- | arch/arm/mach-omap2/board-zoom3.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/board-zoom3.c b/arch/arm/mach-omap2/board-zoom3.c index 79fcad65567..6ca0b834161 100644 --- a/arch/arm/mach-omap2/board-zoom3.c +++ b/arch/arm/mach-omap2/board-zoom3.c | |||
@@ -25,12 +25,6 @@ | |||
25 | #include "mux.h" | 25 | #include "mux.h" |
26 | #include "sdram-hynix-h8mbx00u0mer-0em.h" | 26 | #include "sdram-hynix-h8mbx00u0mer-0em.h" |
27 | 27 | ||
28 | static void __init omap_zoom_map_io(void) | ||
29 | { | ||
30 | omap2_set_globals_36xx(); | ||
31 | omap34xx_map_common_io(); | ||
32 | } | ||
33 | |||
34 | static struct omap_board_config_kernel zoom_config[] __initdata = { | 28 | static struct omap_board_config_kernel zoom_config[] __initdata = { |
35 | }; | 29 | }; |
36 | 30 | ||
@@ -132,7 +126,8 @@ MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") | |||
132 | .phys_io = ZOOM_UART_BASE, | 126 | .phys_io = ZOOM_UART_BASE, |
133 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, | 127 | .io_pg_offst = (ZOOM_UART_VIRT >> 18) & 0xfffc, |
134 | .boot_params = 0x80000100, | 128 | .boot_params = 0x80000100, |
135 | .map_io = omap_zoom_map_io, | 129 | .map_io = omap3_map_io, |
130 | .reserve = omap_reserve, | ||
136 | .init_irq = omap_zoom_init_irq, | 131 | .init_irq = omap_zoom_init_irq, |
137 | .init_machine = omap_zoom_init, | 132 | .init_machine = omap_zoom_init, |
138 | .timer = &omap_timer, | 133 | .timer = &omap_timer, |