From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Dec 2011 00:37:35 +0000 (+1100)
Subject: Merge remote-tracking branch 'arm/for-next'
X-Git-Tag: next-20111213~95
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fd4a2226d4ca2e169f09ed1b6cff9491ba6809a5;p=karo-tx-linux.git

Merge remote-tracking branch 'arm/for-next'

Conflicts:
	arch/arm/mach-mxs/mach-m28evk.c
	arch/arm/mach-mxs/mach-stmp378x_devb.c
---

fd4a2226d4ca2e169f09ed1b6cff9491ba6809a5
diff --cc arch/arm/mach-mxs/mach-m28evk.c
index 6b00577b7025,7799cd91a341..2f2758230edf
--- a/arch/arm/mach-mxs/mach-m28evk.c
+++ b/arch/arm/mach-mxs/mach-m28evk.c
@@@ -361,6 -361,7 +361,7 @@@ static struct sys_timer m28evk_timer = 
  MACHINE_START(M28EVK, "DENX M28 EVK")
  	.map_io		= mx28_map_io,
  	.init_irq	= mx28_init_irq,
 -	.init_machine	= m28evk_init,
  	.timer		= &m28evk_timer,
 +	.init_machine	= m28evk_init,
+ 	.restart	= mxs_restart,
  MACHINE_END
diff --cc arch/arm/mach-mxs/mach-stmp378x_devb.c
index 6834dea38c04,857e857672c4..a626c07b8713
--- a/arch/arm/mach-mxs/mach-stmp378x_devb.c
+++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c
@@@ -115,6 -115,7 +115,7 @@@ static struct sys_timer stmp378x_dvb_ti
  MACHINE_START(STMP378X, "STMP378X")
  	.map_io		= mx23_map_io,
  	.init_irq	= mx23_init_irq,
 -	.init_machine	= stmp378x_dvb_init,
  	.timer		= &stmp378x_dvb_timer,
 +	.init_machine	= stmp378x_dvb_init,
+ 	.restart	= mxs_restart,
  MACHINE_END