summaryrefslogtreecommitdiff
path: root/arch/arm/mach-mxs/mach-mx28evk.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:28 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:28 +0200
commitd6bb0f27709b91e674ce1441e2dd5e68620edf14 (patch)
tree1b79f4894618a8849b06d0f12152e9c35053d94a /arch/arm/mach-mxs/mach-mx28evk.c
parent2f540738f8d228016c6cd0d3b303896c174ecee3 (diff)
parent91056a63a7d8dbc817747a22d9a9490463323575 (diff)
Merge branch 'imx/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/mach-mxs/mach-mx28evk.c')
-rw-r--r--arch/arm/mach-mxs/mach-mx28evk.c2
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