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>

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 1fafc324460743654a46079c87781c99dfe3c10d..b9a465bd2d0ffb32af5c5f5e852489df20e4489c 100644 (file)
--- 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