diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:15 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 08:25:27 -0500 |
| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (patch) | |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c /arch/arm/mach-kirkwood/sheevaplug-setup.c | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 (diff) | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 (diff) | |
Merge branch 'restart' into for-linus
Conflicts:
arch/arm/mach-exynos/cpu.c
The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Diffstat (limited to 'arch/arm/mach-kirkwood/sheevaplug-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/sheevaplug-setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 046eeb6b9f5..4ea70e5f713 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c | |||
| @@ -144,6 +144,7 @@ MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") | |||
| 144 | .init_early = kirkwood_init_early, | 144 | .init_early = kirkwood_init_early, |
| 145 | .init_irq = kirkwood_init_irq, | 145 | .init_irq = kirkwood_init_irq, |
| 146 | .timer = &kirkwood_timer, | 146 | .timer = &kirkwood_timer, |
| 147 | .restart = kirkwood_restart, | ||
| 147 | MACHINE_END | 148 | MACHINE_END |
| 148 | #endif | 149 | #endif |
| 149 | 150 | ||
| @@ -155,5 +156,6 @@ MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") | |||
| 155 | .init_early = kirkwood_init_early, | 156 | .init_early = kirkwood_init_early, |
| 156 | .init_irq = kirkwood_init_irq, | 157 | .init_irq = kirkwood_init_irq, |
| 157 | .timer = &kirkwood_timer, | 158 | .timer = &kirkwood_timer, |
| 159 | .restart = kirkwood_restart, | ||
| 158 | MACHINE_END | 160 | MACHINE_END |
| 159 | #endif | 161 | #endif |