diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-04 15:15:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:57:17 +0100 |
| commit | 271a74fc875210d3dfcc03d557fb5d86d3990a0f (patch) | |
| tree | f428c434f573180885c4c2404b706f4bf4c550bb /arch/arm/mach-pxa/icontrol.c | |
| parent | ARM: restart: prima2: use new restart hook (diff) | |
| download | linux-271a74fc875210d3dfcc03d557fb5d86d3990a0f.tar.xz linux-271a74fc875210d3dfcc03d557fb5d86d3990a0f.zip | |
ARM: restart: pxa: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/icontrol.c')
| -rw-r--r-- | arch/arm/mach-pxa/icontrol.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index f78d5db758da..e239b82c99d7 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c @@ -196,5 +196,6 @@ MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") .init_irq = pxa3xx_init_irq, .handle_irq = pxa3xx_handle_irq, .timer = &pxa_timer, - .init_machine = icontrol_init + .init_machine = icontrol_init, + .restart = pxa_restart, MACHINE_END |