Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

[~andy/linux] / arch / arm / mach-mmp / gplugd.c

diff --git a/arch/arm/mach-mmp/gplugd.c b/arch/arm/mach-mmp/gplugd.c
index e266f66a4670a55d566b41016b35a7d088bb9a65..87765467de633c896c00188906bb289c966dda68 100644 (file)
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@ -195,4 +195,5 @@ MACHINE_START(GPLUGD, "PXA168-based GuruPlug Display (gplugD) Platform")
        .init_irq       = pxa168_init_irq,
        .timer          = &pxa168_timer,
        .init_machine   = gplugd_init,
+       .restart        = pxa168_restart,
 MACHINE_END