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-omap3evm.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-omap3evm.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index c452b3f3331a..15c69a0c1ce5 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
| @@ -681,7 +681,7 @@ static void __init omap3_evm_init(void) | |||
| 681 | 681 | ||
| 682 | MACHINE_START(OMAP3EVM, "OMAP3 EVM") | 682 | MACHINE_START(OMAP3EVM, "OMAP3 EVM") |
| 683 | /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ | 683 | /* Maintainer: Syed Mohammed Khasim - Texas Instruments */ |
| 684 | .boot_params = 0x80000100, | 684 | .atag_offset = 0x100, |
| 685 | .reserve = omap_reserve, | 685 | .reserve = omap_reserve, |
| 686 | .map_io = omap3_map_io, | 686 | .map_io = omap3_map_io, |
| 687 | .init_early = omap3_evm_init_early, | 687 | .init_early = omap3_evm_init_early, |