diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-11 15:23:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-11 15:23:15 +0200 |
| commit | 0df03a30c333d67ee9b4c37f32d423624f48fe05 (patch) | |
| tree | c8f8304fb05926777defdc4607c95f91d340d6a3 /include/linux | |
| parent | 0a733e6effb4a429551d8b000aa02750cc7e04ba (diff) | |
| parent | 6cdcdb793791f776ea9408581b1242b636d43b37 (diff) | |
Merge branch 'pm-cpufreq'
* pm-cpufreq:
intel_pstate: Add Haswell CPU models
Revert "cpufreq: make sure frequency transitions are serialized"
cpufreq: Use signed type for 'ret' variable, to store negative error values
cpufreq: Remove temporary fix for race between CPU hotplug and sysfs-writes
cpufreq: Synchronize the cpufreq store_*() routines with CPU hotplug
cpufreq: Invoke __cpufreq_remove_dev_finish() after releasing cpu_hotplug.lock
cpufreq: Split __cpufreq_remove_dev() into two parts
cpufreq: Fix wrong time unit conversion
cpufreq: serialize calls to __cpufreq_governor()
cpufreq: don't allow governor limits to be changed when it is disabled
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpufreq.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index d568f3975eeb..fcabc42d66ab 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -85,7 +85,6 @@ struct cpufreq_policy { struct list_head policy_list; struct kobject kobj; struct completion kobj_unregister; - int transition_ongoing; /* Tracks transition status */ }; /* Only for ACPI */ |