aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/mss2-setup.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 06:13:41 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 07:57:16 -0500
commit764cbcc2e3fa444c205b20b3d7908b06b60716ab (patch)
tree32f133e176578ec1ace190dccff5de23968e3890 /arch/arm/mach-orion5x/mss2-setup.c
parentbaa9588344d35d751d6e2b1677ec67e7b32d2878 (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/mss2-setup.c')
-rw-r--r--arch/arm/mach-orion5x/mss2-setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index 6020e26b1c71..65faaa34de61 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -267,5 +267,6 @@ MACHINE_START(MSS2, "Maxtor Shared Storage II")
267 .init_early = orion5x_init_early, 267 .init_early = orion5x_init_early,
268 .init_irq = orion5x_init_irq, 268 .init_irq = orion5x_init_irq,
269 .timer = &orion5x_timer, 269 .timer = &orion5x_timer,
270 .fixup = tag_fixup_mem32 270 .fixup = tag_fixup_mem32,
271 .restart = orion5x_restart,
271MACHINE_END 272MACHINE_END