diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-07 10:55:00 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-01-07 10:55:00 -0500 |
| commit | 52fd119334f2c44e5db48a494e8cc5a0cbb60b1b (patch) | |
| tree | 7b19a73a7b2d6c549e5a03e72dbc8e3120da9b76 /config-x86-generic | |
| parent | dd6834d028ed696e10a3a6ff4fdc388c7b0bf4b0 (diff) | |
| download | kernel-52fd119334f2c44e5db48a494e8cc5a0cbb60b1b.tar.gz kernel-52fd119334f2c44e5db48a494e8cc5a0cbb60b1b.tar.xz kernel-52fd119334f2c44e5db48a494e8cc5a0cbb60b1b.zip | |
Linux v3.19-rc3-38-gbdec41963890
- Enable POWERCAP and INTEL_RAPL options
- Reenable debugging options.
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 9a69726d1..f6682a9a4 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -346,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 @@ -502,6 +502,7 @@ CONFIG_PINCTRL_CHERRYVIEW=m CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_INTEL_SOC_DTS_THERMAL=m CONFIG_INT340X_THERMAL=m +CONFIG_INTEL_RAPL=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m |