summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-02-03 20:29:11 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-02-03 20:29:11 +0100
commita6a283fe67e156cb31445f1f7099eb678e169739 (patch)
treec020a68e083f7d78d41b01c5c8dd0983a012c1a3 /kernel-s390x-debug-fedora.config
parentefa6baec3ce44de13420dda4fb45e492ff939ab5 (diff)
parent4f1ee1b6a4ea731fa4ff082fa13a449ec0ee9a0e (diff)
downloadkernel-a6a283fe67e156cb31445f1f7099eb678e169739.tar.gz
kernel-a6a283fe67e156cb31445f1f7099eb678e169739.tar.xz
kernel-a6a283fe67e156cb31445f1f7099eb678e169739.zip
Merge remote-tracking branch 'origin/main' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc6.20210203git3aaf0a27ffc2.143.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
-rw-r--r--kernel-s390x-debug-fedora.config1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index edf7492c7..fdcc1d8fa 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -4614,7 +4614,6 @@ CONFIG_REMOTEPROC=y
CONFIG_RFKILL_GPIO=m
CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL is not set
-# CONFIG_RH_DISABLE_DEPRECATED is not set
# CONFIG_RHEL_DIFFERENCES is not set
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set