summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-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-s390x-debug-fedora.config
parent8634aa00a4da93f2dede7b352bde9716672b24ef (diff)
parent4594f2534fa269a516151f1a79953d27ac2ee8f6 (diff)
downloadkernel-5.14.0-0.rc7.20210827git77dd11439b86.57.vanilla.1.fc35.tar.gz
kernel-5.14.0-0.rc7.20210827git77dd11439b86.57.vanilla.1.fc35.tar.xz
kernel-5.14.0-0.rc7.20210827git77dd11439b86.57.vanilla.1.fc35.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-s390x-debug-fedora.config')
-rw-r--r--kernel-s390x-debug-fedora.config13
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 0d3dcdf3c..36aa849ce 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2980,7 +2980,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
@@ -3228,7 +3227,7 @@ CONFIG_MFD_ENE_KB3930=m
# CONFIG_MFD_HI6421_SPMI is not set
CONFIG_MFD_INTEL_M10_BMC=m
# CONFIG_MFD_INTEL_PMC_BXT is not set
-CONFIG_MFD_INTEL_PMT=m
+# CONFIG_MFD_INTEL_PMT is not set
# CONFIG_MFD_IQS62X is not set
# CONFIG_MFD_JANZ_CMODIO is not set
# CONFIG_MFD_KEMPLD is not set
@@ -3582,7 +3581,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
@@ -3652,7 +3650,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
@@ -3674,7 +3672,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
@@ -4549,7 +4547,6 @@ CONFIG_PTP_1588_CLOCK_IDTCM=m
CONFIG_PTP_1588_CLOCK_KVM=m
# CONFIG_PTP_1588_CLOCK_OCP is not set
CONFIG_PTP_1588_CLOCK_PCH=m
-# CONFIG_PTP_1588_CLOCK_VMW is not set
CONFIG_PTP_1588_CLOCK=y
# CONFIG_PVPANIC_MMIO is not set
# CONFIG_PVPANIC_PCI is not set
@@ -4952,8 +4949,8 @@ CONFIG_RTW88_8723DE=m
CONFIG_RTW88_8821CE=m
CONFIG_RTW88_8822BE=m
CONFIG_RTW88_8822CE=m
-# CONFIG_RTW88_DEBUGFS is not set
-# CONFIG_RTW88_DEBUG is not set
+CONFIG_RTW88_DEBUGFS=y
+CONFIG_RTW88_DEBUG=y
CONFIG_RTW88=m
CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_RXKAD=y