diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:18:36 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 14:18:36 +0000 |
| commit | af72617279f6d56163328802cf6545b95a538345 (patch) | |
| tree | 205d947b4b32257d8f6a0e4a248b5212ea1f1dba /arch/arm/mach-mxs/mach-stmp378x_devb.c | |
| parent | 58a394b3fae8b08e3efb04b740cb85aa4fe98d29 (diff) | |
| parent | 7d8b894ca135a896f32934f7d096714d5bc687e6 (diff) | |
| download | linux-af72617279f6d56163328802cf6545b95a538345.tar.gz linux-af72617279f6d56163328802cf6545b95a538345.tar.bz2 linux-af72617279f6d56163328802cf6545b95a538345.zip | |
Merge branch 'mxs/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mxs/mach-stmp378x_devb.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-stmp378x_devb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-stmp378x_devb.c b/arch/arm/mach-mxs/mach-stmp378x_devb.c index 177e53123a02..6834dea38c04 100644 --- a/arch/arm/mach-mxs/mach-stmp378x_devb.c +++ b/arch/arm/mach-mxs/mach-stmp378x_devb.c @@ -115,6 +115,6 @@ static struct sys_timer stmp378x_dvb_timer = { 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, MACHINE_END |