diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-04 11:47:50 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:21 -0500 |
commit | f5733a1e80fa0b40bea815ddf605ece272c6dac1 (patch) | |
tree | c56e1f0f9ae032bf5c25d5e577eb62b51cf7c506 /arch/arm/mach-vexpress | |
parent | b56a7c6b36388b3eca887bd5d24f297e63e5bb5b (diff) |
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/arm/mach-vexpress')
-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 1fafc3244607..b9a465bd2d0f 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) | |||
437 | amba_device_register(v2m_amba_devs[i], &iomem_resource); | 437 | amba_device_register(v2m_amba_devs[i], &iomem_resource); |
438 | 438 | ||
439 | pm_power_off = v2m_power_off; | 439 | pm_power_off = v2m_power_off; |
440 | arm_pm_restart = v2m_restart; | ||
441 | 440 | ||
442 | ct_desc->init_tile(); | 441 | ct_desc->init_tile(); |
443 | } | 442 | } |
@@ -449,4 +448,5 @@ MACHINE_START(VEXPRESS, "ARM-Versatile Express") | |||
449 | .init_irq = v2m_init_irq, | 448 | .init_irq = v2m_init_irq, |
450 | .timer = &v2m_timer, | 449 | .timer = &v2m_timer, |
451 | .init_machine = v2m_init, | 450 | .init_machine = v2m_init, |
451 | .restart = v2m_restart, | ||
452 | MACHINE_END | 452 | MACHINE_END |