diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 16:21:16 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 16:21:16 -0400 |
commit | c49a089c3eedbc4b3fa9c3d469599a6c14dea4c5 (patch) | |
tree | 9f21ef73bb2d3b8fad642158c6ffa6e33ccabee3 /drivers/cpufreq/cpufreq_governor.h | |
parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
parent | 3de9bdeb28638e164d1f0eb38dd68e3f5d2ac95c (diff) |
Merge back earlier 'pm-cpufreq' material
Diffstat (limited to 'drivers/cpufreq/cpufreq_governor.h')
-rw-r--r-- | drivers/cpufreq/cpufreq_governor.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index d5f12b4b11b8..a02d78b25898 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h | |||
@@ -18,10 +18,9 @@ | |||
18 | #define _CPUFREQ_GOVERNOR_H | 18 | #define _CPUFREQ_GOVERNOR_H |
19 | 19 | ||
20 | #include <linux/cpufreq.h> | 20 | #include <linux/cpufreq.h> |
21 | #include <linux/kobject.h> | 21 | #include <linux/kernel_stat.h> |
22 | #include <linux/module.h> | ||
22 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
23 | #include <linux/workqueue.h> | ||
24 | #include <linux/sysfs.h> | ||
25 | 24 | ||
26 | /* | 25 | /* |
27 | * The polling frequency depends on the capability of the processor. Default | 26 | * The polling frequency depends on the capability of the processor. Default |
@@ -169,7 +168,6 @@ struct od_dbs_tuners { | |||
169 | unsigned int sampling_rate; | 168 | unsigned int sampling_rate; |
170 | unsigned int sampling_down_factor; | 169 | unsigned int sampling_down_factor; |
171 | unsigned int up_threshold; | 170 | unsigned int up_threshold; |
172 | unsigned int adj_up_threshold; | ||
173 | unsigned int powersave_bias; | 171 | unsigned int powersave_bias; |
174 | unsigned int io_is_busy; | 172 | unsigned int io_is_busy; |
175 | }; | 173 | }; |
@@ -223,7 +221,7 @@ struct od_ops { | |||
223 | void (*powersave_bias_init_cpu)(int cpu); | 221 | void (*powersave_bias_init_cpu)(int cpu); |
224 | unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy, | 222 | unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy, |
225 | unsigned int freq_next, unsigned int relation); | 223 | unsigned int freq_next, unsigned int relation); |
226 | void (*freq_increase)(struct cpufreq_policy *p, unsigned int freq); | 224 | void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq); |
227 | }; | 225 | }; |
228 | 226 | ||
229 | struct cs_ops { | 227 | struct cs_ops { |