summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410/mach-amlm5900.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-08 21:07:42 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-08 21:07:42 +0200
commit71f2c153755442c05d15cd025484f676a5f3541f (patch)
treefe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-s3c2410/mach-amlm5900.c
parentMerge branch 'sirf/cleanup' into next/cleanup (diff)
parentMerge branch 'for_3_2/for-rmk/arm_cpu_pm' of git://gitorious.org/omap-sw-deve... (diff)
downloadlinux-71f2c153755442c05d15cd025484f676a5f3541f.tar.xz
linux-71f2c153755442c05d15cd025484f676a5f3541f.zip
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-amlm5900.c')
-rw-r--r--arch/arm/mach-s3c2410/mach-amlm5900.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index dabc141243f3..79838942b0ac 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -236,7 +236,7 @@ static void __init amlm5900_init(void)
}
MACHINE_START(AML_M5900, "AML_M5900")
- .boot_params = S3C2410_SDRAM_PA + 0x100,
+ .atag_offset = 0x100,
.map_io = amlm5900_map_io,
.init_irq = s3c24xx_init_irq,
.init_machine = amlm5900_init,