X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fimx6%2Fconfig-3.12;h=5ec8eddbd0397875064592bb738527b920f30c4a;hb=7523aa05c1cc6f1162d0151cc28e46182767bf15;hp=dadebfccbddfcd1136b9dbf288d89540c4675dd1;hpb=c9ee51ad384b9f282f2d623a2fb43462bb4faaf9;p=openwrt%2Fstaging%2Fchunkeey.git

diff --git a/target/linux/imx6/config-3.12 b/target/linux/imx6/config-3.12
index dadebfccbd..5ec8eddbd0 100644
--- a/target/linux/imx6/config-3.12
+++ b/target/linux/imx6/config-3.12
@@ -14,8 +14,6 @@ CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_ARCH_NR_GPIO=0
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -195,8 +193,8 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
 # CONFIG_IMX2_WDT is not set
-# CONFIG_IMX_DMA is not set
-# CONFIG_IMX_SDMA is not set
+CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
 # CONFIG_IMX_WEIM is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y