summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs/mach-mx23evk.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:02 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:02 +0200
commit91056a63a7d8dbc817747a22d9a9490463323575 (patch)
treea220d265d01075c05f4cd35d998e65849bb47bc8 /arch/arm/mach-mxs/mach-mx23evk.c
parent05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff)
parentf2d8df92f69b8c719ca1a46d2615b168b2cc9cdf (diff)
downloadlinux-stable-91056a63a7d8dbc817747a22d9a9490463323575.tar.gz
linux-stable-91056a63a7d8dbc817747a22d9a9490463323575.tar.bz2
linux-stable-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-mx23evk.c')
-rw-r--r--arch/arm/mach-mxs/mach-mx23evk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c
index 99b01e988c8d..69e218de536e 100644
--- a/arch/arm/mach-mxs/mach-mx23evk.c
+++ b/arch/arm/mach-mxs/mach-mx23evk.c
@@ -181,6 +181,6 @@ MACHINE_START(MX23EVK, "Freescale MX23 EVK")
/* Maintainer: Freescale Semiconductor, Inc. */
.map_io = mx23_map_io,
.init_irq = mx23_init_irq,
- .init_machine = mx23evk_init,
.timer = &mx23evk_timer,
+ .init_machine = mx23evk_init,
MACHINE_END