diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-21 23:27:11 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-12-21 23:27:11 +0100 |
| commit | b23212950e690f04005b72c05574114b82ee38c8 (patch) | |
| tree | 71f4d832eed817d8984fa09b5ebfa9d8b02824f1 /kernel-x86_64.config | |
| parent | 6b9121d64ab2480f41622350c90ec5119738c67a (diff) | |
| parent | 62458db07f27a4addb32ad9cccb383b5570a4e20 (diff) | |
| download | kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc25.tar.gz kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc25.tar.xz kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc25.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc26kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc25kernel-4.10.0-0.rc0.git7.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index a2943df48..e39d32047 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -3365,6 +3365,7 @@ CONFIG_NET_VENDOR_ROCKER=y CONFIG_NET_VENDOR_SILAN=y CONFIG_NET_VENDOR_SIS=y CONFIG_NET_VENDOR_SMSC=y +# CONFIG_NET_VENDOR_SOLARFLARE is not set CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set |