summaryrefslogtreecommitdiffstats
path: root/config-armv7
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-20 11:23:45 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-20 11:25:00 -0700
commit8a052bf240d0b95d9c255ca9291a0669e5e28ac5 (patch)
treeac792feb3fbe87ced551a909a9be889b7f3b4629 /config-armv7
parente8f3f4f939f4a5f7be4a3b0af4219951cfe61e8d (diff)
downloadkernel-8a052bf240d0b95d9c255ca9291a0669e5e28ac5.tar.gz
kernel-8a052bf240d0b95d9c255ca9291a0669e5e28ac5.tar.xz
kernel-8a052bf240d0b95d9c255ca9291a0669e5e28ac5.zip
Linux v4.6-6148-g03b979d
- Docs, i2c, md, iommu, sound, pci, pinctrl, dmaengine, kvm, security merges
Diffstat (limited to 'config-armv7')
-rw-r--r--config-armv71
1 files changed, 0 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7
index 755cefa99..d2191cee9 100644
--- a/config-armv7
+++ b/config-armv7
@@ -587,7 +587,6 @@ CONFIG_SPI_CADENCE=m
CONFIG_I2C_CADENCE=m
CONFIG_XILINX_WATCHDOG=m
CONFIG_XILINX_XADC=m
-CONFIG_XILINX_VDMA=m
CONFIG_SND_SOC_ADI=m
CONFIG_SND_SOC_ADI_AXI_I2S=m
CONFIG_SND_SOC_ADI_AXI_SPDIF=m