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-omap3logic.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-omap3logic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3logic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 703aeb5b8fd4..01354a214caf 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c | |||
@@ -209,7 +209,7 @@ static void __init omap3logic_init(void) | |||
209 | } | 209 | } |
210 | 210 | ||
211 | MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") | 211 | MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") |
212 | .boot_params = 0x80000100, | 212 | .atag_offset = 0x100, |
213 | .map_io = omap3_map_io, | 213 | .map_io = omap3_map_io, |
214 | .init_early = omap3logic_init_early, | 214 | .init_early = omap3logic_init_early, |
215 | .init_irq = omap3_init_irq, | 215 | .init_irq = omap3_init_irq, |
@@ -218,7 +218,7 @@ MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board") | |||
218 | MACHINE_END | 218 | MACHINE_END |
219 | 219 | ||
220 | MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") | 220 | MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board") |
221 | .boot_params = 0x80000100, | 221 | .atag_offset = 0x100, |
222 | .map_io = omap3_map_io, | 222 | .map_io = omap3_map_io, |
223 | .init_early = omap3logic_init_early, | 223 | .init_early = omap3logic_init_early, |
224 | .init_irq = omap3_init_irq, | 224 | .init_irq = omap3_init_irq, |