diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-s3c2440/mach-at2440evb.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-s3c2440/mach-at2440evb.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-at2440evb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-at2440evb.c b/arch/arm/mach-s3c2440/mach-at2440evb.c index 6c98b789b8c6..38887ee0c784 100644 --- a/arch/arm/mach-s3c2440/mach-at2440evb.c +++ b/arch/arm/mach-s3c2440/mach-at2440evb.c | |||
| @@ -233,7 +233,7 @@ static void __init at2440evb_init(void) | |||
| 233 | 233 | ||
| 234 | 234 | ||
| 235 | MACHINE_START(AT2440EVB, "AT2440EVB") | 235 | MACHINE_START(AT2440EVB, "AT2440EVB") |
| 236 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 236 | .atag_offset = 0x100, |
| 237 | .map_io = at2440evb_map_io, | 237 | .map_io = at2440evb_map_io, |
| 238 | .init_machine = at2440evb_init, | 238 | .init_machine = at2440evb_init, |
| 239 | .init_irq = s3c24xx_init_irq, | 239 | .init_irq = s3c24xx_init_irq, |