diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-07 13:27:04 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-07 13:27:04 +0100 |
| commit | dab52f9e96a2c82d1a38600ec7c00c44563bd39e (patch) | |
| tree | c104429763b6f645dcb987a5cb01258291fc45d9 /arch/powerpc | |
| parent | fd88af077b05f5e84786eac5c0c0c3e6c6d160ea (diff) | |
| parent | 0c70444cee4bf2e72c169737fccbd4108f4588fc (diff) | |
Merge branch 'pm-cpufreq' into linux-next
* pm-cpufreq:
cpufreq: dt: Don't use generic platdev driver for ti-cpufreq platforms
cpufreq: ti: Add cpufreq driver to determine available OPPs at runtime
Documentation: dt: add bindings for ti-cpufreq
PM / OPP: Expose _of_get_opp_desc_node as dev_pm_opp API
cpufreq: Fix typos in comments
cpufreq: intel_pstate: Disable energy efficiency optimization
cpufreq: intel_pstate: Calculate guaranteed performance for HWP
cpufreq: intel_pstate: Make HWP limits compatible with legacy
cpufreq: intel_pstate: Lower frequency than expected under no_turbo
cpufreq: intel_pstate: Operation mode control from sysfs
cpufreq: intel_pstate: Expose global sysfs attributes upfront
cpufreq: Remove CPUFREQ_START notifier event
ACPI: processor_perflib: Simplify code and stop using CPUFREQ_START
cpufreq: powernv: Add boost files to export ultra-turbo frequencies
cpufreq: Documentation: Updates based on current code
cpufreq: Documentation: Minor reformatting
cpufreq: Remove CONFIG_CPU_FREQ_STAT_DETAILS config option
cpufreq: Remove policy create/remove notifiers
cpufreq: brcmstb-avs-cpufreq: properly retrieve P-state upon suspend
cpufreq: brcmstb-avs-cpufreq: extend sysfs entry brcm_avs_pmap
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/configs/ppc6xx_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig index 3ce91a3df27f..1d2d69dd6409 100644 --- a/arch/powerpc/configs/ppc6xx_defconfig +++ b/arch/powerpc/configs/ppc6xx_defconfig @@ -62,7 +62,6 @@ CONFIG_MPC8610_HPCD=y CONFIG_GEF_SBC610=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=m -CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m |