summaryrefslogtreecommitdiffstats
path: root/kernel-i686.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-03-13 21:53:01 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-03-13 21:53:01 +0100
commit82996f747d62b732c02f9eade1fb7e20cf993331 (patch)
tree41129f900a7367b3b3e8cec68ab4bc46284d94a0 /kernel-i686.config
parente24e150d0b8fa9a0cab6b01c312b9702bc410055 (diff)
parent177691df09ec3379dfdf3980aeaa6f21e39d94b6 (diff)
downloadkernel-4.11.0-0.rc2.git0.1.vanilla.knurd.1.fc25.tar.gz
kernel-4.11.0-0.rc2.git0.1.vanilla.knurd.1.fc25.tar.xz
kernel-4.11.0-0.rc2.git0.1.vanilla.knurd.1.fc25.zip
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc2.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-i686.config')
-rw-r--r--kernel-i686.config1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-i686.config b/kernel-i686.config
index 2fa682913..3a16f7510 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3077,7 +3077,6 @@ CONFIG_MTRR_SANITIZER=y
CONFIG_MTRR=y
# CONFIG_MVIAC3_2 is not set
CONFIG_MVMDIO=m
-# CONFIG_MVPP2 is not set
CONFIG_MWAVE=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_PCIE=m