diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-14 08:40:03 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-09-14 08:41:32 -0400 |
| commit | 0b12c85af6596ee57731bb7ef0e73ab4b307d661 (patch) | |
| tree | 4cedc32224c3bbef2a878a44bbcd46266a7205a4 /config-x86-generic | |
| parent | 60c24aba493c878816eb0c0aa1b70ff6c12bb26e (diff) | |
| download | kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.tar.gz kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.tar.xz kernel-0b12c85af6596ee57731bb7ef0e73ab4b307d661.zip | |
Linux v4.3-rc1
- Disable debugging options.
Also rebase the kdbus patches against 4.3-rc1
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index cdf5ae8ac..d71f0c51b 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -359,7 +359,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 @@ -547,6 +547,7 @@ CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INT340X_THERMAL=m CONFIG_INTEL_RAPL=m +CONFIG_INTEL_PCH_THERMAL=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m |