aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mxs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 12:32:02 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-20 12:32:02 -0400
commit91056a63a7d8dbc817747a22d9a9490463323575 (patch)
treea220d265d01075c05f4cd35d998e65849bb47bc8 /arch/arm/mach-mxs
parent05d900c9d8ce536c6792efb323c82b1c97b54bf9 (diff)
parentf2d8df92f69b8c719ca1a46d2615b168b2cc9cdf (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')
-rw-r--r--arch/arm/mach-mxs/mach-mx23evk.c2
-rw-r--r--arch/arm/mach-mxs/mach-mx28evk.c2
-rw-r--r--arch/arm/mach-mxs/mach-tx28.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mxs/mach-mx23evk.c b/arch/arm/mach-mxs/mach-mx23evk.c
index 99b01e988c8..69e218de536 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")
181 /* Maintainer: Freescale Semiconductor, Inc. */ 181 /* Maintainer: Freescale Semiconductor, Inc. */
182 .map_io = mx23_map_io, 182 .map_io = mx23_map_io,
183 .init_irq = mx23_init_irq, 183 .init_irq = mx23_init_irq,
184 .init_machine = mx23evk_init,
185 .timer = &mx23evk_timer, 184 .timer = &mx23evk_timer,
185 .init_machine = mx23evk_init,
186MACHINE_END 186MACHINE_END
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index 8b3aa7afdae..0173c3bce4e 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,
424MACHINE_END 424MACHINE_END
diff --git a/arch/arm/mach-mxs/mach-tx28.c b/arch/arm/mach-mxs/mach-tx28.c
index 515a423f82c..955593806fd 100644
--- a/arch/arm/mach-mxs/mach-tx28.c
+++ b/arch/arm/mach-mxs/mach-tx28.c
@@ -175,6 +175,6 @@ static struct sys_timer tx28_timer = {
175MACHINE_START(TX28, "Ka-Ro electronics TX28 module") 175MACHINE_START(TX28, "Ka-Ro electronics TX28 module")
176 .map_io = mx28_map_io, 176 .map_io = mx28_map_io,
177 .init_irq = mx28_init_irq, 177 .init_irq = mx28_init_irq,
178 .init_machine = tx28_stk5v3_init,
179 .timer = &tx28_timer, 178 .timer = &tx28_timer,
179 .init_machine = tx28_stk5v3_init,
180MACHINE_END 180MACHINE_END