summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-08-18 10:39:30 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-08-18 10:39:33 -0400
commite85b4686962a2be8f23d8aa1a7a6a86656fcc6c6 (patch)
treefb16f9195e614a73b038b3a057b48f7c214f87e7 /config-x86-generic
parent24a429b4e91aabc5499d75eb46dc46ed71f0a497 (diff)
downloadkernel-e85b4686962a2be8f23d8aa1a7a6a86656fcc6c6.tar.gz
kernel-e85b4686962a2be8f23d8aa1a7a6a86656fcc6c6.tar.xz
kernel-e85b4686962a2be8f23d8aa1a7a6a86656fcc6c6.zip
Linux v3.17-rc1
- Disable debugging options. - Fix CONFIG_SPI_DEBUG settings
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 55857a67c..5e8e7a4e5 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -338,7 +338,7 @@ CONFIG_SP5100_TCO=m
# CONFIG_MEMTEST is not set
# CONFIG_DEBUG_TLBFLUSH is not set
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
CONFIG_HP_ILO=m
@@ -371,6 +371,7 @@ CONFIG_X86_DECODER_SELFTEST=y
CONFIG_ACPI_CMPC=m
CONFIG_MSI_WMI=m
CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
CONFIG_VGA_SWITCHEROO=y
CONFIG_LPC_SCH=m