summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-29 11:24:25 -0400
commit76c11d9b55366c6da11ee821716d56b68110a2c6 (patch)
treeb7eae841919f78db12d303d20863564b05bf3f33 /config-x86-generic
parentc9229e16082bdc9b2f74a08bfdc77bcfed51df18 (diff)
downloadkernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.gz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.tar.xz
kernel-76c11d9b55366c6da11ee821716d56b68110a2c6.zip
Linux v4.1-11235-gc63f887bdae8
- Reenable debugging options.
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic7
1 files changed, 5 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic
index ae330b44e..785d27123 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -334,6 +334,7 @@ CONFIG_SENSORS_I5K_AMB=m
CONFIG_SENSORS_FAM15H_POWER=m
CONFIG_SENSORS_ACPI_POWER=m
CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_DELL_SMM=m
# CONFIG_CPA_DEBUG is not set
@@ -345,7 +346,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
@@ -516,7 +517,9 @@ CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
-
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_AC97_CODEC=m
+# CONFIG_SND_SOC_TAS571X is not set
# CONFIG_INTEL_POWERCLAMP is not set