diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:53 -0400 |
| commit | 5839fec9d8db35b2b07359b18a77295418e239ad (patch) | |
| tree | f060f613c7d76b2784a93c96b7b8cd3f0d201254 /arch/arm/mach-s5pv210/mach-smdkc110.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s5pv210/mach-smdkc110.c')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-smdkc110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c index 6c412c8ceccc..f7266bb0cac8 100644 --- a/arch/arm/mach-s5pv210/mach-smdkc110.c +++ b/arch/arm/mach-s5pv210/mach-smdkc110.c | |||
| @@ -136,7 +136,7 @@ static void __init smdkc110_machine_init(void) | |||
| 136 | 136 | ||
| 137 | MACHINE_START(SMDKC110, "SMDKC110") | 137 | MACHINE_START(SMDKC110, "SMDKC110") |
| 138 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ | 138 | /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ |
| 139 | .boot_params = S5P_PA_SDRAM + 0x100, | 139 | .atag_offset = 0x100, |
| 140 | .init_irq = s5pv210_init_irq, | 140 | .init_irq = s5pv210_init_irq, |
| 141 | .map_io = smdkc110_map_io, | 141 | .map_io = smdkc110_map_io, |
| 142 | .init_machine = smdkc110_machine_init, | 142 | .init_machine = smdkc110_machine_init, |