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 git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-armadillo5x0.c
diff --git
a/arch/arm/mach-imx/mach-armadillo5x0.c
b/arch/arm/mach-imx/mach-armadillo5x0.c
index
ffb40ff
..
ede2710
100644
(file)
--- a/
arch/arm/mach-imx/mach-armadillo5x0.c
+++ b/
arch/arm/mach-imx/mach-armadillo5x0.c
@@
-490,6
+490,8
@@
static struct platform_device *devices[] __initdata = {
*/
static void __init armadillo5x0_init(void)
{
+ imx31_soc_init();
+
mxc_iomux_setup_multiple_pins(armadillo5x0_pins,
ARRAY_SIZE(armadillo5x0_pins), "armadillo5x0");