diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 04:58:59 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 04:58:59 +0100 |
commit | cfaf8fc5b59527281e9ddc2e0e04e1127936e17f (patch) | |
tree | 975700d72e51f02c3c816a04fc5f141cdc4f6361 /arch/arm/mach-s5p64x0/mach-smdk6450.c | |
parent | c6c3a3a03e6de52866bc81a32fc551733625d553 (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
download | op-kernel-dev-cfaf8fc5b59527281e9ddc2e0e04e1127936e17f.zip op-kernel-dev-cfaf8fc5b59527281e9ddc2e0e04e1127936e17f.tar.gz |
Merge branch 'depends/rmk/memory_h' into next/cleanup2
There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s5p64x0/mach-smdk6450.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c index 2a69caa..0ab129e 100644 --- a/arch/arm/mach-s5p64x0/mach-smdk6450.c +++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c @@ -259,7 +259,7 @@ static void __init smdk6450_machine_init(void) MACHINE_START(SMDK6450, "SMDK6450") /* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */ - .boot_params = S5P64X0_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = s5p6450_init_irq, .map_io = smdk6450_map_io, |