summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-08-05 06:44:35 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-08-05 06:44:35 -0400
commit7de7a7f141b95f00243a92457a630748933014b3 (patch)
treec20c6e607a6c92f1a84d60efba7be1336380675b /config-x86-generic
parent9c9c16627d5996e27aa87a4d336a01df81eb746b (diff)
downloadkernel-7de7a7f141b95f00243a92457a630748933014b3.tar.gz
kernel-7de7a7f141b95f00243a92457a630748933014b3.tar.xz
kernel-7de7a7f141b95f00243a92457a630748933014b3.zip
Linux v3.16-3652-gf19107379dbc
- 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 7968fdaea..15abf6716 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -119,6 +119,7 @@ CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
CONFIG_CRYPTO_DEV_CCP=y
CONFIG_CRYPTO_DEV_CCP_DD=m
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
CONFIG_GENERIC_ISA_DMA=y
@@ -183,6 +184,7 @@ CONFIG_EDAC_X38=m
CONFIG_EDAC_MCE_INJ=m
CONFIG_EDAC_DECODE_MCE=m
CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_IE31200=m
CONFIG_SCHED_MC=y
@@ -334,7 +336,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