summaryrefslogtreecommitdiffstats
path: root/kernel-i686-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-08-27 16:43:48 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-08-27 16:43:48 +0200
commit3b953159f7bf235aa6e2a3ec15c45ca94e753601 (patch)
tree4e9bde78f15176656d6b1820d7e46f75ff989b15 /kernel-i686-fedora.config
parent8634aa00a4da93f2dede7b352bde9716672b24ef (diff)
parent4594f2534fa269a516151f1a79953d27ac2ee8f6 (diff)
downloadkernel-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-i686-fedora.config')
-rw-r--r--kernel-i686-fedora.config6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 1ce89e067..2e4315f1f 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -3224,7 +3224,6 @@ CONFIG_LIBFCOE=m
# CONFIG_LIBIPW_DEBUG is not set
# CONFIG_LIBNVDIMM is not set
# CONFIG_LIDAR_LITE_V2 is not set
-CONFIG_LIQUIDIO_VF=m
CONFIG_LIRC=y
# CONFIG_LITEX_SOC_CONTROLLER is not set
CONFIG_LIVEPATCH=y
@@ -3854,7 +3853,6 @@ CONFIG_MUX_MMIO=m
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
CONFIG_MVMDIO=m
-CONFIG_MVPP2_PTP=y
CONFIG_MWAVE=m
CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_PCIE=m
@@ -3927,7 +3925,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
@@ -3949,7 +3947,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