diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-04 15:47:50 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:21 +0000 |
| commit | f5733a1e80fa0b40bea815ddf605ece272c6dac1 (patch) | |
| tree | c56e1f0f9ae032bf5c25d5e577eb62b51cf7c506 /arch | |
| parent | b56a7c6b36388b3eca887bd5d24f297e63e5bb5b (diff) | |
| download | op-kernel-dev-f5733a1e80fa0b40bea815ddf605ece272c6dac1.zip op-kernel-dev-f5733a1e80fa0b40bea815ddf605ece272c6dac1.tar.gz | |
ARM: restart: Versatile Express: use new restart hook
Hook the Versatile Express platform restart code into the new restart
hook.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 1fafc324..b9a465b 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -437,7 +437,6 @@ static void __init v2m_init(void) amba_device_register(v2m_amba_devs[i], &iomem_resource); pm_power_off = v2m_power_off; - arm_pm_restart = v2m_restart; ct_desc->init_tile(); } @@ -449,4 +448,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") .init_irq = v2m_init_irq, .timer = &v2m_timer, .init_machine = v2m_init, + .restart = v2m_restart, MACHINE_END |
