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-sa1100/simpad.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-sa1100/simpad.c')
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index cfb76077bd25..a1c2427655da 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
| @@ -229,7 +229,7 @@ arch_initcall(simpad_init); | |||
| 229 | 229 | ||
| 230 | MACHINE_START(SIMPAD, "Simpad") | 230 | MACHINE_START(SIMPAD, "Simpad") |
| 231 | /* Maintainer: Holger Freyther */ | 231 | /* Maintainer: Holger Freyther */ |
| 232 | .boot_params = 0xc0000100, | 232 | .atag_offset = 0x100, |
| 233 | .map_io = simpad_map_io, | 233 | .map_io = simpad_map_io, |
| 234 | .init_irq = sa1100_init_irq, | 234 | .init_irq = sa1100_init_irq, |
| 235 | .timer = &sa1100_timer, | 235 | .timer = &sa1100_timer, |