diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-10-21 13:16:02 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-10-21 13:16:02 -0700 |
| commit | 42ac8ca89aef66618e8ae2d6e48e3f523bfcd69d (patch) | |
| tree | 0df8b56815356f89d3de9ec072c96daea4a5c1d5 | |
| parent | 57504c056bfc5421b4256892f049a1bb6d9775e9 (diff) | |
| parent | d30d9cf39c522f3aa767015e5b6d3d18b4414137 (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.10-1-android-0
| -rw-r--r-- | arch/arm/mach-exynos4/mach-origen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/mach-origen.c b/arch/arm/mach-exynos4/mach-origen.c index ed59f86001a..b5f6f38557c 100644 --- a/arch/arm/mach-exynos4/mach-origen.c +++ b/arch/arm/mach-exynos4/mach-origen.c @@ -100,7 +100,7 @@ static void __init origen_machine_init(void) MACHINE_START(ORIGEN, "ORIGEN") /* Maintainer: JeongHyeon Kim <jhkim@insignal.co.kr> */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = exynos4_init_irq, .map_io = origen_map_io, .init_machine = origen_machine_init, |