diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-08-28 00:07:43 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-08-28 00:07:43 +0000 |
| commit | ae660e85d3b34e8f9344aafdf20c141adcd1677c (patch) | |
| tree | 4a6e4b4b2e84f69ea257ff22fc2861904ed012a9 /target/linux/imx6/config-3.10 | |
| parent | 99c46e474eec3ae235d7a3257a47d5bc6a0c189d (diff) | |
| download | upstream-ae660e85d3b34e8f9344aafdf20c141adcd1677c.tar.gz upstream-ae660e85d3b34e8f9344aafdf20c141adcd1677c.tar.bz2 upstream-ae660e85d3b34e8f9344aafdf20c141adcd1677c.zip | |
imx6: disable sdma until license issues are solved
Also, synchronize patches with upstream.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 37853
Diffstat (limited to 'target/linux/imx6/config-3.10')
| -rw-r--r-- | target/linux/imx6/config-3.10 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/imx6/config-3.10 b/target/linux/imx6/config-3.10 index 1a1d30ae92..7978cd8077 100644 --- a/target/linux/imx6/config-3.10 +++ b/target/linux/imx6/config-3.10 @@ -170,7 +170,7 @@ CONFIG_I2C_IMX=y # CONFIG_IMX2_WDT is not set # CONFIG_IMX_DMA is not set CONFIG_IMX_PCIE=y -CONFIG_IMX_SDMA=y +# CONFIG_IMX_SDMA is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y @@ -213,8 +213,7 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MULTI_IRQ_HANDLER=y CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_MX3_IPU=y -CONFIG_MX3_IPU_IRQS=4 +# CONFIG_MX3_IPU is not set # CONFIG_MXC_DEBUG_BOARD is not set # CONFIG_MXC_IRQ_PRIOR is not set CONFIG_MXS_DMA=y |