diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
| commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
| tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-omap2/board-zoom.c | |
| parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
| parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c index d56c79661038..be6684dc4f55 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
| @@ -130,7 +130,7 @@ static void __init omap_zoom_init(void) | |||
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | 132 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") |
| 133 | .boot_params = 0x80000100, | 133 | .atag_offset = 0x100, |
| 134 | .reserve = omap_reserve, | 134 | .reserve = omap_reserve, |
| 135 | .map_io = omap3_map_io, | 135 | .map_io = omap3_map_io, |
| 136 | .init_early = omap3430_init_early, | 136 | .init_early = omap3430_init_early, |
| @@ -140,7 +140,7 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | |||
| 140 | MACHINE_END | 140 | MACHINE_END |
| 141 | 141 | ||
| 142 | MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") | 142 | MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") |
| 143 | .boot_params = 0x80000100, | 143 | .atag_offset = 0x100, |
| 144 | .reserve = omap_reserve, | 144 | .reserve = omap_reserve, |
| 145 | .map_io = omap3_map_io, | 145 | .map_io = omap3_map_io, |
| 146 | .init_early = omap3630_init_early, | 146 | .init_early = omap3630_init_early, |