diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-07 08:08:44 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-07 08:08:44 +0200 |
| commit | 8ab9431272717b54609f7f93d9e507eab417a95b (patch) | |
| tree | e11170bb719bfbca6d65fdc121883f28e82e007f /kernel-i686.config | |
| parent | e3e2f386afb9a395cdab00733c3cd1e6f2b53507 (diff) | |
| parent | 2b8f265622da10409c2b9dcd2c5e579a713de9d9 (diff) | |
| download | kernel-8ab9431272717b54609f7f93d9e507eab417a95b.tar.gz kernel-8ab9431272717b54609f7f93d9e507eab417a95b.tar.xz kernel-8ab9431272717b54609f7f93d9e507eab417a95b.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc3.git4.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-i686.config')
| -rw-r--r-- | kernel-i686.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 2805e9354..5a0c7e842 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -3459,6 +3459,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y +# CONFIG_NET_VENDOR_SNI is not set CONFIG_NET_VENDOR_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y @@ -3842,6 +3843,7 @@ CONFIG_PCIEAER=y # CONFIG_PCIEASPM_DEBUG is not set CONFIG_PCIEASPM=y CONFIG_PCIE_DPC=y +# CONFIG_PCIE_DW_HOST_ECAM is not set # CONFIG_PCIE_DW_PLAT is not set CONFIG_PCIE_ECRC=y # CONFIG_PCI_ENDPOINT is not set |