summaryrefslogtreecommitdiffstats
path: root/kernel-x86_64.config
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-11-23 14:19:51 +0000
committerPeter Robinson <pbrobinson@gmail.com>2017-11-23 14:19:51 +0000
commitf74f35732db6f6add9e1d2e08c4444b62b903970 (patch)
tree9042982e28195261ce738a7450c32153ded11053 /kernel-x86_64.config
parent2d1ca3ead8b7e8bd492112ff2a9a519f6419331e (diff)
parent5d8f3c9211e5a1999d682c77f6dd71e833cf5772 (diff)
downloadkernel-f74f35732db6f6add9e1d2e08c4444b62b903970.tar.gz
kernel-f74f35732db6f6add9e1d2e08c4444b62b903970.tar.xz
kernel-f74f35732db6f6add9e1d2e08c4444b62b903970.zip
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/kernel
Diffstat (limited to 'kernel-x86_64.config')
-rw-r--r--kernel-x86_64.config1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 085d88c72..4988c690c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4081,6 +4081,7 @@ CONFIG_PPS_CLIENT_PARPORT=m
# CONFIG_PPS_DEBUG is not set
CONFIG_PPS=m
CONFIG_PPTP=m
+# CONFIG_PREEMPTIRQ_EVENTS is not set
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_NONE is not set
CONFIG_PREEMPT_VOLUNTARY=y