Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[pandora-kernel.git] / arch / arm / mach-imx / mach-mx31_3ds.c

diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 62983bd..c20be75 100644 (file)
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -13,6 +13,7 @@
  */
 
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/clk.h>
@@ -686,6 +687,8 @@ static void __init mx31_3ds_init(void)
 {
        int ret;
 
+       imx31_soc_init();
+
        /* Configure SPI1 IOMUX */
        mxc_iomux_set_gpr(MUX_PGP_CSPI_BB, true);