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-s3c64xx/mach-crag6410.c | |
| 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-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 f32ec68002ef..806580388f30 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -763,7 +763,7 @@ static void __init crag6410_machine_init(void) MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") /* Maintainer: Mark Brown <broonie@opensource.wolfsonmicro.com> */ - .boot_params = S3C64XX_PA_SDRAM + 0x100, + .atag_offset = 0x100, .init_irq = s3c6410_init_irq, .map_io = crag6410_map_io, .init_machine = crag6410_machine_init, |