summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-09-01 12:25:34 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-09-01 12:25:34 -0400
commit01b3ca6be6c833a0166021643ce80cab8820882f (patch)
tree5c1f6b7010cc85e71d6449086593bee7774da1b2 /config-x86-generic
parent3c964af1ebd4ca84c116300884b417f8c75b7b8a (diff)
downloadkernel-01b3ca6be6c833a0166021643ce80cab8820882f.tar.gz
kernel-01b3ca6be6c833a0166021643ce80cab8820882f.tar.xz
kernel-01b3ca6be6c833a0166021643ce80cab8820882f.zip
Linux v4.2-2744-g65a99597f044
- Reenable debugging options.
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic4
1 files changed, 3 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 9bfd81de5..fbe4c854c 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -133,6 +133,7 @@ CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=m
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
CONFIG_GENERIC_ISA_DMA=y
@@ -354,7 +355,7 @@ CONFIG_SP5100_TCO=m
# CONFIG_MEMTEST is not set
# CONFIG_DEBUG_TLBFLUSH is not set
-# CONFIG_MAXSMP is not set
+CONFIG_MAXSMP=y
CONFIG_HP_ILO=m
@@ -569,3 +570,4 @@ CONFIG_PCH_CAN=m
# CONFIG_X86_DEBUG_FPU is not set
# CONFIG_PUNIT_ATOM_DEBUG is not set
+# CONFIG_AMD_MCE_INJ is not set