From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 4 Nov 2011 15:47:50 +0000 (+0000)
Subject: ARM: restart: Versatile Express: use new restart hook
X-Git-Tag: next-20111122~80^2^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35da0e49e6d9f579343edcf8cfc296725e8c8dc3;p=karo-tx-linux.git

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 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)
 		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