diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-08 12:36:37 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-04-08 12:36:37 +0200 |
commit | fa845fe0cca1bbb13cebdf3708c52ed8b5a3d0e5 (patch) | |
tree | c982d1b707bbc6c1a695e65055edf6061e9d4770 /kernel-i686.config | |
parent | 0502878c9c9346c9b23bbea9cf4740029946360e (diff) | |
parent | d070a33ff4d56722cd9f7823ccc9ece3102d52ab (diff) | |
download | kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc27.tar.gz kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc27.tar.xz kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc27.zip |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc5.git4.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686.config')
-rw-r--r-- | kernel-i686.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index 442a1b671..cf02575a4 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -1313,6 +1313,7 @@ CONFIG_EFI=y # CONFIG_EMBEDDED is not set CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENABLE_WARN_DEPRECATED is not set +CONFIG_ENA_ETHERNET=m # CONFIG_ENC28J60 is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y @@ -3314,7 +3315,7 @@ CONFIG_NET_VENDOR_ADAPTEC=y CONFIG_NET_VENDOR_AGERE=y # CONFIG_NET_VENDOR_ALACRITECH is not set CONFIG_NET_VENDOR_ALTEON=y -# CONFIG_NET_VENDOR_AMAZON is not set +CONFIG_NET_VENDOR_AMAZON=y CONFIG_NET_VENDOR_AMD=y # CONFIG_NET_VENDOR_AQUANTIA is not set CONFIG_NET_VENDOR_ARC=y |