summaryrefslogtreecommitdiff
path: root/arch/arm/configs/davinci_all_defconfig
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-29 18:43:16 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-29 18:43:16 +0400
commit78283dd29e647775cb1e63a4d6554b3090b9a9ff (patch)
tree46a179781ed356c0546379ecc46ca5daed7ae50a /arch/arm/configs/davinci_all_defconfig
parent435932f2c75efcdd07273a437b9be32647d56d73 (diff)
parent5ae90d8e467e625e447000cb4335c4db973b1095 (diff)
downloadlinux-78283dd29e647775cb1e63a4d6554b3090b9a9ff.tar.xz
Merge 3.11-rc3 into usb-next
Diffstat (limited to 'arch/arm/configs/davinci_all_defconfig')
-rw-r--r--arch/arm/configs/davinci_all_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index c86fd75e181a..ab2f7378352c 100644
--- a/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@ -162,6 +162,8 @@ CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_RTC_CLASS=y
+CONFIG_DMADEVICES=y
+CONFIG_TI_EDMA=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_XFS_FS=m