diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-omap2/board-zoom.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
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 8a98c3c303f..72f1db4863e 100644 --- a/arch/arm/mach-omap2/board-zoom.c +++ b/arch/arm/mach-omap2/board-zoom.c | |||
| @@ -133,7 +133,7 @@ static void __init omap_zoom_init(void) | |||
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | 135 | MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") |
| 136 | .boot_params = 0x80000100, | 136 | .atag_offset = 0x100, |
| 137 | .reserve = omap_reserve, | 137 | .reserve = omap_reserve, |
| 138 | .map_io = omap3_map_io, | 138 | .map_io = omap3_map_io, |
| 139 | .init_early = omap_zoom_init_early, | 139 | .init_early = omap_zoom_init_early, |
| @@ -143,7 +143,7 @@ MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board") | |||
| 143 | MACHINE_END | 143 | MACHINE_END |
| 144 | 144 | ||
| 145 | MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") | 145 | MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board") |
| 146 | .boot_params = 0x80000100, | 146 | .atag_offset = 0x100, |
| 147 | .reserve = omap_reserve, | 147 | .reserve = omap_reserve, |
| 148 | .map_io = omap3_map_io, | 148 | .map_io = omap3_map_io, |
| 149 | .init_early = omap_zoom_init_early, | 149 | .init_early = omap_zoom_init_early, |