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-ixp23xx/roadrunner.c | |
| parent | 2b228e8cf33dbdd323dd4a05a973c6bd45c44133 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
Merge branch 'dt/gic' into highbank/soc
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-ixp23xx/roadrunner.c')
| -rw-r--r-- | arch/arm/mach-ixp23xx/roadrunner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp23xx/roadrunner.c b/arch/arm/mach-ixp23xx/roadrunner.c index 844551d2368b..8f4dcbba9025 100644 --- a/arch/arm/mach-ixp23xx/roadrunner.c +++ b/arch/arm/mach-ixp23xx/roadrunner.c | |||
| @@ -175,6 +175,6 @@ MACHINE_START(ROADRUNNER, "ADI Engineering RoadRunner Development Platform") | |||
| 175 | .map_io = ixp23xx_map_io, | 175 | .map_io = ixp23xx_map_io, |
| 176 | .init_irq = ixp23xx_init_irq, | 176 | .init_irq = ixp23xx_init_irq, |
| 177 | .timer = &ixp23xx_timer, | 177 | .timer = &ixp23xx_timer, |
| 178 | .boot_params = 0x00000100, | 178 | .atag_offset = 0x100, |
| 179 | .init_machine = roadrunner_init, | 179 | .init_machine = roadrunner_init, |
| 180 | MACHINE_END | 180 | MACHINE_END |