From 764cbcc2e3fa444c205b20b3d7908b06b60716ab Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 5 Nov 2011 10:13:41 +0000 Subject: ARM: restart: orion5x: use new restart hook Hook these platforms restart code into the new restart hook rather than using arch_reset(). In addition, convert calls to arm_machine_restart() to orion5x_restart() to ensure that they continue to work as intended. Acked-by: Nicolas Pitre Signed-off-by: Russell King --- arch/arm/mach-orion5x/d2net-setup.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/arm/mach-orion5x/d2net-setup.c') diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c index 8c8300951f46..d75dcfa0f01c 100644 --- a/arch/arm/mach-orion5x/d2net-setup.c +++ b/arch/arm/mach-orion5x/d2net-setup.c @@ -343,6 +343,7 @@ MACHINE_START(D2NET, "LaCie d2 Network") .init_irq = orion5x_init_irq, .timer = &orion5x_timer, .fixup = tag_fixup_mem32, + .restart = orion5x_restart, MACHINE_END #endif @@ -355,6 +356,7 @@ MACHINE_START(BIGDISK, "LaCie Big Disk Network") .init_irq = orion5x_init_irq, .timer = &orion5x_timer, .fixup = tag_fixup_mem32, + .restart = orion5x_restart, MACHINE_END #endif -- cgit v1.2.3