diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 06:13:41 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:57:16 -0500 |
commit | 764cbcc2e3fa444c205b20b3d7908b06b60716ab (patch) | |
tree | 32f133e176578ec1ace190dccff5de23968e3890 /arch/arm/mach-orion5x/d2net-setup.c | |
parent | baa9588344d35d751d6e2b1677ec67e7b32d2878 (diff) |
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 <nico@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-orion5x/d2net-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/d2net-setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
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") | |||
343 | .init_irq = orion5x_init_irq, | 343 | .init_irq = orion5x_init_irq, |
344 | .timer = &orion5x_timer, | 344 | .timer = &orion5x_timer, |
345 | .fixup = tag_fixup_mem32, | 345 | .fixup = tag_fixup_mem32, |
346 | .restart = orion5x_restart, | ||
346 | MACHINE_END | 347 | MACHINE_END |
347 | #endif | 348 | #endif |
348 | 349 | ||
@@ -355,6 +356,7 @@ MACHINE_START(BIGDISK, "LaCie Big Disk Network") | |||
355 | .init_irq = orion5x_init_irq, | 356 | .init_irq = orion5x_init_irq, |
356 | .timer = &orion5x_timer, | 357 | .timer = &orion5x_timer, |
357 | .fixup = tag_fixup_mem32, | 358 | .fixup = tag_fixup_mem32, |
359 | .restart = orion5x_restart, | ||
358 | MACHINE_END | 360 | MACHINE_END |
359 | #endif | 361 | #endif |
360 | 362 | ||