Merge tag 'for_linus-3.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jwesse...

[~andy/linux] / arch / arm / mach-mxs / mach-stmp378x_devb.c

diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c
index 6834dea38c04cce77e20bffc2baa3019327d9610..a626c07b8713c46235eac72e3a1ef3dda9abdd0e 100644 (file)
--- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@ -117,4 +117,5 @@ MACHINE_START(STMP378X, "STMP378X")
        .init_irq       = mx23_init_irq,
        .timer          = &stmp378x_dvb_timer,
        .init_machine   = stmp378x_dvb_init,
+       .restart        = mxs_restart,
 MACHINE_END