diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 08:47:27 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 08:47:27 -0400 |
commit | df80442d1ee2902c2e39f90f18160f2e08d14c06 (patch) | |
tree | e7c2080df1a5851e0c5353c48a211d9af91aae68 /arch/arm/mach-s3c64xx/mach-crag6410.c | |
parent | 8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) |
Merge branch 'depends/rmk/memory_h' into next/cleanup2
Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.
Conflicts:
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-s3c64xx/mach-crag6410.c')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index af0c2fe1ea37..4c76e08423fb 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -766,7 +766,7 @@ static void __init crag6410_machine_init(void) | |||
766 | 766 | ||
767 | MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") | 767 | MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") |
768 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ | 768 | /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ |
769 | .boot_params = S3C64XX_PA_SDRAM + 0x100, | 769 | .atag_offset = 0x100, |
770 | .init_irq = s3c6410_init_irq, | 770 | .init_irq = s3c6410_init_irq, |
771 | .map_io = crag6410_map_io, | 771 | .map_io = crag6410_map_io, |
772 | .init_machine = crag6410_machine_init, | 772 | .init_machine = crag6410_machine_init, |