diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-21 07:56:01 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-21 07:56:01 +0200 |
| commit | a7a0c90031acf1cd1e7bd777bda70e1738c805c9 (patch) | |
| tree | 9188e551ff78c6423cfdf95240226ed368bb482f /config-armv7 | |
| parent | 89f8c3ffa504e07b9ce529acf90c4bfd22a440a4 (diff) | |
| parent | 8a052bf240d0b95d9c255ca9291a0669e5e28ac5 (diff) | |
| download | kernel-a7a0c90031acf1cd1e7bd777bda70e1738c805c9.tar.gz kernel-a7a0c90031acf1cd1e7bd777bda70e1738c805c9.tar.xz kernel-a7a0c90031acf1cd1e7bd777bda70e1738c805c9.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git5.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 1 |
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 |