Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / arm / mach-imx / mach-pca100.c

diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c
index 63e182556778ad97ebb8a0b8e1f1100fc1449b8c..71083aa160381be2a3b4392cf87a1880ba1d6326 100644 (file)
--- a/arch/arm/mach-imx/mach-pca100.c
+++ b/arch/arm/mach-imx/mach-pca100.c
@@ -37,7 +37,6 @@
 #include <mach/iomux-mx27.h>
 #include <asm/mach/time.h>
 #include <mach/audmux.h>
-#include <mach/mxc_nand.h>
 #include <mach/irqs.h>
 #include <mach/ulpi.h>
 
@@ -358,6 +357,8 @@ static void __init pca100_init(void)
 {
        int ret;
 
+       imx27_soc_init();
+
        /* SSI unit */
        mxc_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0,
                                  MXC_AUDMUX_V1_PCR_SYN | /* 4wire mode */