summaryrefslogtreecommitdiffstats
path: root/kernel-i686-debug-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-11 13:45:44 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-11 13:45:44 +0100
commit5ca6a50dd3bac49de841d28306fc86e1019c896b (patch)
tree6bb091875bea7c4fd70e4a20c4e7095d5cb048c8 /kernel-i686-debug-fedora.config
parent48d2ea1892fb00405dd817b212cff4e821f6b881 (diff)
parentd7d00d12af89d70ff64ba9f4ecf3691c7b8a9453 (diff)
downloadkernel-5ca6a50dd3bac49de841d28306fc86e1019c896b.tar.gz
kernel-5ca6a50dd3bac49de841d28306fc86e1019c896b.tar.xz
kernel-5ca6a50dd3bac49de841d28306fc86e1019c896b.zip
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686-debug-fedora.config')
-rw-r--r--kernel-i686-debug-fedora.config1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 1b675520e..14b461a9d 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -200,7 +200,6 @@ CONFIG_ALIENWARE_WMI=m
CONFIG_ALIM1535_WDT=m
CONFIG_ALIM7101_WDT=m
# CONFIG_ALIX is not set
-CONFIG_ALLOW_LOCKDOWN_LIFT_BY_SYSRQ=y
# CONFIG_ALTERA_FREEZE_BRIDGE is not set
# CONFIG_ALTERA_MBOX is not set
CONFIG_ALTERA_MSGDMA=m