git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
mach-mx23evk.c
diff --git
a/arch/arm/mach-mxs/mach-mx23evk.c
b/arch/arm/mach-mxs/mach-mx23evk.c
index
99b01e9
..
c325fbe
100644
(file)
--- a/
arch/arm/mach-mxs/mach-mx23evk.c
+++ b/
arch/arm/mach-mxs/mach-mx23evk.c
@@
-166,6
+166,7
@@
static void __init mx23evk_init(void)
gpio_set_value(MX23EVK_BL_ENABLE, 1);
mx23_add_mxsfb(&mx23evk_mxsfb_pdata);
gpio_set_value(MX23EVK_BL_ENABLE, 1);
mx23_add_mxsfb(&mx23evk_mxsfb_pdata);
+ mx23_add_rtc_stmp3xxx();
}
static void __init mx23evk_timer_init(void)
}
static void __init mx23evk_timer_init(void)
@@
-181,6
+182,6
@@
MACHINE_START(MX23EVK, "Freescale MX23 EVK")
/* Maintainer: Freescale Semiconductor, Inc. */
.map_io = mx23_map_io,
.init_irq = mx23_init_irq,
/* Maintainer: Freescale Semiconductor, Inc. */
.map_io = mx23_map_io,
.init_irq = mx23_init_irq,
- .init_machine = mx23evk_init,
.timer = &mx23evk_timer,
.timer = &mx23evk_timer,
+ .init_machine = mx23evk_init,
MACHINE_END
MACHINE_END