diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 23:07:42 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 23:07:42 +0400 |
commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-s5pc100 | |
parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
download | linux-71f2c153755442c05d15cd025484f676a5f3541f.tar.xz |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index 0b70762ebf1a..26f5c91c9427 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c @@ -248,7 +248,7 @@ static void __init smdkc100_machine_init(void) MACHINE_START(SMDKC100, "SMDKC100") /* Maintainer: Byungho Min <bhmin@samsung.com> */ - .boot_params = S5P_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = s5pc100_init_irq, .map_io = smdkc100_map_io, .init_machine = smdkc100_machine_init, |