diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-27 16:43:48 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-27 16:43:48 +0200 |
| commit | 3b953159f7bf235aa6e2a3ec15c45ca94e753601 (patch) | |
| tree | 4e9bde78f15176656d6b1820d7e46f75ff989b15 /kernel-x86_64-fedora.config | |
| parent | 8634aa00a4da93f2dede7b352bde9716672b24ef (diff) | |
| parent | 4594f2534fa269a516151f1a79953d27ac2ee8f6 (diff) | |
| download | kernel-3b953159f7bf235aa6e2a3ec15c45ca94e753601.tar.gz kernel-3b953159f7bf235aa6e2a3ec15c45ca94e753601.tar.xz kernel-3b953159f7bf235aa6e2a3ec15c45ca94e753601.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc7.20210827git77dd11439b86.57.vanilla.1.fc35
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 189cd0ca1..4bb61a018 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3280,7 +3280,6 @@ CONFIG_LIBFCOE=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_LIBNVDIMM=m # CONFIG_LIDAR_LITE_V2 is not set -CONFIG_LIQUIDIO_VF=m CONFIG_LIRC=y # CONFIG_LITEX_SOC_CONTROLLER is not set CONFIG_LIVEPATCH=y @@ -3897,7 +3896,6 @@ CONFIG_MUX_GPIO=m CONFIG_MUX_MMIO=m # CONFIG_MVIAC7 is not set CONFIG_MVMDIO=m -CONFIG_MVPP2_PTP=y CONFIG_MWAVE=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_PCIE=m @@ -3969,7 +3967,7 @@ CONFIG_NETDEVSIM=m CONFIG_NET_DROP_MONITOR=y # CONFIG_NET_DSA_AR9331 is not set CONFIG_NET_DSA_BCM_SF2=m -# CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK is not set +CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m # CONFIG_NET_DSA_LANTIQ_GSWIP is not set CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA=m @@ -3991,7 +3989,7 @@ CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m CONFIG_NET_DSA_TAG_8021Q=m # CONFIG_NET_DSA_TAG_AR9331 is not set CONFIG_NET_DSA_TAG_GSWIP=m -# CONFIG_NET_DSA_TAG_HELLCREEK is not set +CONFIG_NET_DSA_TAG_HELLCREEK=m CONFIG_NET_DSA_TAG_KSZ=m CONFIG_NET_DSA_TAG_OCELOT_8021Q=m CONFIG_NET_DSA_TAG_OCELOT=m |