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-s3c2440/mach-anubis.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-anubis.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index d7086788b1ff..74f92fc3fd04 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -498,7 +498,7 @@ static void __init anubis_init(void) | |||
| 498 | 498 | ||
| 499 | MACHINE_START(ANUBIS, "Simtec-Anubis") | 499 | MACHINE_START(ANUBIS, "Simtec-Anubis") |
| 500 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ | 500 | /* Maintainer: Ben Dooks <ben@simtec.co.uk> */ |
| 501 | .boot_params = S3C2410_SDRAM_PA + 0x100, | 501 | .atag_offset = 0x100, |
| 502 | .map_io = anubis_map_io, | 502 | .map_io = anubis_map_io, |
| 503 | .init_machine = anubis_init, | 503 | .init_machine = anubis_init, |
| 504 | .init_irq = s3c24xx_init_irq, | 504 | .init_irq = s3c24xx_init_irq, |