Merge branch 'samsung/driver' into next/drivers

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / capc7117.c

diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c
index 5516317b9e64dd59a43d90648b5b3e29678f9205..c91727d1fe097ab5bf01d0dbf261afefc7748775 100644 (file)
--- a/arch/arm/mach-pxa/capc7117.c
+++ b/arch/arm/mach-pxa/capc7117.c
@@ -153,5 +153,6 @@ MACHINE_START(CAPC7117,
        .init_irq = pxa3xx_init_irq,
        .handle_irq = pxa3xx_handle_irq,
        .timer = &pxa_timer,
-       .init_machine = capc7117_init
+       .init_machine = capc7117_init,
+       .restart        = pxa_restart,
 MACHINE_END