summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 07:04:59 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-04 07:07:33 -0400
commitf32bbb3ed5f46a5b3ac06af56898cd89978b4a3f (patch)
treef7b82f2224fac2ad7aff7915b26e65bbe426ce2c /config-armv7
parent9cd5288f7382fa33c1624399e6ec8ca3faa30e99 (diff)
downloadkernel-f32bbb3ed5f46a5b3ac06af56898cd89978b4a3f.tar.gz
kernel-f32bbb3ed5f46a5b3ac06af56898cd89978b4a3f.tar.xz
kernel-f32bbb3ed5f46a5b3ac06af56898cd89978b4a3f.zip
Linux v3.11-716-gb3b4911
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv74
1 files changed, 3 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7
index 2cb8c51d7..5d171c819 100644
--- a/config-armv7
+++ b/config-armv7
@@ -120,6 +120,7 @@ CONFIG_OMAP_MBOX_KFIFO_SIZE=256
CONFIG_OMAP_DM_TIMER=y
CONFIG_OMAP_PM_NOOP=y
CONFIG_DMA_OMAP=y
+CONFIG_TI_CPPI41=m
CONFIG_OMAP_IOMMU=y
CONFIG_OMAP_IOVMM=m
CONFIG_HWSPINLOCK_OMAP=m
@@ -129,7 +130,8 @@ CONFIG_OMAP_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
CONFIG_TI_ST=m
-CONFIG_TI_EDMA=y
+# needs CONFIG_TI_PRIV_EDMA but nothing selects it
+# CONFIG_TI_EDMA is not set
CONFIG_TI_SOC_THERMAL=m
CONFIG_TI_DAC7512=m
CONFIG_TI_DAVINCI_EMAC=m