diff options
| author | Arnd Bergmann | 2011-10-20 18:32:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2011-10-20 18:32:02 +0200 |
| commit | 91056a63a7d8dbc817747a22d9a9490463323575 (patch) | |
| tree | a220d265d01075c05f4cd35d998e65849bb47bc8 /arch/arm/mach-mxs/mach-mx28evk.c | |
| parent | Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup (diff) | |
| parent | Merge branches 'cleanups/mxs', 'cleanups/mx3-defconfig' and 'cleanups/include... (diff) | |
| download | kernel-qcow2-linux-91056a63a7d8dbc817747a22d9a9490463323575.tar.gz kernel-qcow2-linux-91056a63a7d8dbc817747a22d9a9490463323575.tar.xz kernel-qcow2-linux-91056a63a7d8dbc817747a22d9a9490463323575.zip | |
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") /* Maintainer: Freescale Semiconductor, Inc. */ .map_io = mx28_map_io, .init_irq = mx28_init_irq, - .init_machine = mx28evk_init, .timer = &mx28evk_timer, + .init_machine = mx28evk_init, MACHINE_END |