diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 21:11:43 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-07 21:11:43 (GMT) |
| commit | 1133bfa6dcf034639486982629d29472737d5e96 (patch) | |
| tree | 8ab074d3dc96defa0e4b2032ecfc9cf38b86caef /include | |
| parent | d8d3b4711297e101bbad826474013edbe342c333 (diff) | |
| parent | cffe4e0e7413eb29fb8bd035c8b12b33a4b8522a (diff) | |
| download | linux-1133bfa6dcf034639486982629d29472737d5e96.tar.xz | |
Merge branch 'pm-cpufreq-ondemand' into pm-cpufreq
* pm-cpufreq:
cpufreq: Remove unused function __cpufreq_driver_getavg()
cpufreq: Remove unused APERF/MPERF support
cpufreq: ondemand: Change the calculation of target frequency
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 90d5a15..e1fd215 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -216,10 +216,6 @@ extern int cpufreq_driver_target(struct cpufreq_policy *policy, extern int __cpufreq_driver_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation); - -extern int __cpufreq_driver_getavg(struct cpufreq_policy *policy, - unsigned int cpu); - int cpufreq_register_governor(struct cpufreq_governor *governor); void cpufreq_unregister_governor(struct cpufreq_governor *governor); @@ -258,8 +254,6 @@ struct cpufreq_driver { unsigned int (*get) (unsigned int cpu); /* optional */ - unsigned int (*getavg) (struct cpufreq_policy *policy, - unsigned int cpu); int (*bios_limit) (int cpu, unsigned int *limit); int (*exit) (struct cpufreq_policy *policy); |