diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-09 07:38:02 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-09 07:38:02 +0100 |
| commit | e01b928da0e1984b498a8e5a054d6e7067adadfa (patch) | |
| tree | 4db3f96f8dd2f4da72fe1dc4b2bb2813fe98af43 /kernel-i686.config | |
| parent | dfe5d795000eb53b0f56696f7be9e8a12cd76275 (diff) | |
| parent | a8888fabaccfcf1fd0885834045f81a7a2b24e6a (diff) | |
| download | kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc24.tar.gz kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc24.tar.xz kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc27kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc26kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc25kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-i686.config')
| -rw-r--r-- | kernel-i686.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel-i686.config b/kernel-i686.config index a3c3eed6a..2fa682913 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2471,7 +2471,7 @@ CONFIG_KGDB_TESTS=y CONFIG_KGDB=y CONFIG_KINGSUN_DONGLE=m # CONFIG_KMX61 is not set -CONFIG_KPROBE_EVENT=y +CONFIG_KPROBE_EVENTS=y # CONFIG_KPROBES_SANITY_TEST is not set CONFIG_KPROBES=y CONFIG_KS0108_DELAY=2 @@ -3360,7 +3360,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_SOLARFLARE=y CONFIG_NET_VENDOR_STMICRO=y CONFIG_NET_VENDOR_SUN=y # CONFIG_NET_VENDOR_SYNOPSYS is not set @@ -5314,7 +5314,7 @@ CONFIG_UNIX_DIAG=m CONFIG_UNIXWARE_DISKLABEL=y CONFIG_UNIX=y CONFIG_UNUSED_SYMBOLS=y -CONFIG_UPROBE_EVENT=y +CONFIG_UPROBE_EVENTS=y # CONFIG_US5182D is not set CONFIG_USB_ACM=m CONFIG_USB_ADUTUX=m |