diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:11:34 -0400 |
| commit | 09fa31a322c8f03871a741cd1d26e5ca04aacbbd (patch) | |
| tree | acdad13d7c332978a91231c4f34b6320a1c7ceb6 /arch/arm/mach-s3c64xx/mach-crag6410.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
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, |