diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-17 10:34:54 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-17 10:34:54 -0400 |
| commit | 3e9248c055609b11a6d62d1129fbf27ce0990ff4 (patch) | |
| tree | e9421cdfba10f6af003305cf0f639aa462f751ce /arch/arm/mach-s3c2410/mach-h1940.c | |
| parent | 14eff7b679a0ea42049cd806545466769f8d1d2d (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-3.1
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-h1940.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index 2a2fa062013..556c535829f 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@ -744,7 +744,7 @@ static void __init h1940_init(void) MACHINE_START(H1940, "IPAQ-H1940") /* Maintainer: Ben Dooks <ben-linux@fluff.org> */ - .boot_params = S3C2410_SDRAM_PA + 0x100, + .atag_offset = 0x100, .map_io = h1940_map_io, .reserve = h1940_reserve, .init_irq = h1940_init_irq, |