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-iop32x/em7210.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-iop32x/em7210.c')
| -rw-r--r-- | arch/arm/mach-iop32x/em7210.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-iop32x/em7210.c b/arch/arm/mach-iop32x/em7210.c index 4325055d4e1..24069e03fdc 100644 --- a/arch/arm/mach-iop32x/em7210.c +++ b/arch/arm/mach-iop32x/em7210.c | |||
| @@ -208,4 +208,5 @@ MACHINE_START(EM7210, "Lanner EM7210") | |||
| 208 | .init_irq = iop32x_init_irq, | 208 | .init_irq = iop32x_init_irq, |
| 209 | .timer = &em7210_timer, | 209 | .timer = &em7210_timer, |
| 210 | .init_machine = em7210_init_machine, | 210 | .init_machine = em7210_init_machine, |
| 211 | .restart = iop3xx_restart, | ||
| 211 | MACHINE_END | 212 | MACHINE_END |