diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 10:54:51 +0100 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-imx/mach-mx31moboard.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
| download | blackbird-op-linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.tar.gz blackbird-op-linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.zip | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31moboard.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index b358383120e7..1d01ef28f25d 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c @@ -567,7 +567,7 @@ static void __init mx31moboard_reserve(void) MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") /* Maintainer: Valentin Longchamp, EPFL Mobots group */ - .boot_params = MX3x_PHYS_OFFSET + 0x100, + .atag_offset = 0x100, .reserve = mx31moboard_reserve, .map_io = mx31_map_io, .init_early = imx31_init_early, |
