diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:32:02 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:32:02 -0400 |
| commit | 91056a63a7d8dbc817747a22d9a9490463323575 (patch) | |
| tree | a220d265d01075c05f4cd35d998e65849bb47bc8 /arch/arm/mach-mxs/mach-mx28evk.c | |
| parent | 05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff) | |
| parent | f2d8df92f69b8c719ca1a46d2615b168b2cc9cdf (diff) | |
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx28evk.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-mx28evk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index 8b3aa7afdae0..0173c3bce4ef 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c | |||
| @@ -419,6 +419,6 @@ MACHINE_START(MX28EVK, "Freescale MX28 EVK") | |||
| 419 | /* Maintainer: Freescale Semiconductor, Inc. */ | 419 | /* Maintainer: Freescale Semiconductor, Inc. */ |
| 420 | .map_io = mx28_map_io, | 420 | .map_io = mx28_map_io, |
| 421 | .init_irq = mx28_init_irq, | 421 | .init_irq = mx28_init_irq, |
| 422 | .init_machine = mx28evk_init, | ||
| 423 | .timer = &mx28evk_timer, | 422 | .timer = &mx28evk_timer, |
| 423 | .init_machine = mx28evk_init, | ||
| 424 | MACHINE_END | 424 | MACHINE_END |