diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-05-17 09:35:57 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-05-17 09:35:57 -0700 |
| commit | 01027370551133b74c154efd23fff29d859efcf2 (patch) | |
| tree | eaa2088000efcc6c37b67adfb4e1c0f77e7a5cee /config-x86-generic | |
| parent | c3b50ba0e0c85eb5eee49ceae99d401183243fc3 (diff) | |
| download | kernel-01027370551133b74c154efd23fff29d859efcf2.tar.gz kernel-01027370551133b74c154efd23fff29d859efcf2.tar.xz kernel-01027370551133b74c154efd23fff29d859efcf2.zip | |
Linux v4.6-1278-g1649098
- Enable CONFIG_INTEL_POWERCLAMP
- pm, ACPI, mmc, regulator, i2c, hwmon, edac, led, arm64, x86, sched, RAS merges
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic index e2e52e40c..328f40020 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -17,6 +17,10 @@ CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y CONFIG_PERF_EVENTS_AMD_POWER=m +CONFIG_PERF_EVENTS_INTEL_UNCORE=m +CONFIG_PERF_EVENTS_INTEL_RAPL=m +CONFIG_PERF_EVENTS_CSTATE=m +CONFIG_PERF_EVENTS_INTEL_CSTATE=m CONFIG_X86_MSR=y CONFIG_X86_CPUID=y @@ -106,6 +110,7 @@ CONFIG_ACPI_CUSTOM_METHOD=m CONFIG_ACPI_BGRT=y # CONFIG_ACPI_EXTLOG is not set # CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set +CONFIG_ACPI_TABLE_UPGRADE=y CONFIG_INTEL_SOC_PMIC=y CONFIG_PMIC_OPREGION=y @@ -575,12 +580,13 @@ CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SUN4I_CODEC is not set # CONFIG_SND_SUN4I_SPDIF is not set -# CONFIG_INTEL_POWERCLAMP is not set +CONFIG_INTEL_POWERCLAMP=m 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_INT3406_THERMAL=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m |