diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:18:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 11:18:49 -0400 |
commit | 44473d991332053eb3fea1e08f8a6ee2c6fb409c (patch) | |
tree | 3f1ace2e7e6d3917870c6c0e91ffa1899f01a326 /drivers/cpufreq/cpufreq_powersave.c | |
parent | bd5d435a96837c3495e62eef37cbe4cb728b79ae (diff) | |
parent | 6501faf8c1bbaa51dc493f3681df016d2ebce833 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] state info wrong after resume
[CPUFREQ] allow use of the powersave governor as the default one
[CPUFREQ] document the currently undocumented parts of the sysfs interface
[CPUFREQ] expose cpufreq coordination requirements regardless of coordination mechanism
Diffstat (limited to 'drivers/cpufreq/cpufreq_powersave.c')
-rw-r--r-- | drivers/cpufreq/cpufreq_powersave.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/cpufreq/cpufreq_powersave.c b/drivers/cpufreq/cpufreq_powersave.c index 13fe06b94b0a..88d2f44fba48 100644 --- a/drivers/cpufreq/cpufreq_powersave.c +++ b/drivers/cpufreq/cpufreq_powersave.c | |||
@@ -35,12 +35,12 @@ static int cpufreq_governor_powersave(struct cpufreq_policy *policy, | |||
35 | return 0; | 35 | return 0; |
36 | } | 36 | } |
37 | 37 | ||
38 | static struct cpufreq_governor cpufreq_gov_powersave = { | 38 | struct cpufreq_governor cpufreq_gov_powersave = { |
39 | .name = "powersave", | 39 | .name = "powersave", |
40 | .governor = cpufreq_governor_powersave, | 40 | .governor = cpufreq_governor_powersave, |
41 | .owner = THIS_MODULE, | 41 | .owner = THIS_MODULE, |
42 | }; | 42 | }; |
43 | 43 | EXPORT_SYMBOL(cpufreq_gov_powersave); | |
44 | 44 | ||
45 | static int __init cpufreq_gov_powersave_init(void) | 45 | static int __init cpufreq_gov_powersave_init(void) |
46 | { | 46 | { |
@@ -58,5 +58,9 @@ MODULE_AUTHOR("Dominik Brodowski <linux@brodo.de>"); | |||
58 | MODULE_DESCRIPTION("CPUfreq policy governor 'powersave'"); | 58 | MODULE_DESCRIPTION("CPUfreq policy governor 'powersave'"); |
59 | MODULE_LICENSE("GPL"); | 59 | MODULE_LICENSE("GPL"); |
60 | 60 | ||
61 | #ifdef CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE | ||
62 | fs_initcall(cpufreq_gov_powersave_init); | ||
63 | #else | ||
61 | module_init(cpufreq_gov_powersave_init); | 64 | module_init(cpufreq_gov_powersave_init); |
65 | #endif | ||
62 | module_exit(cpufreq_gov_powersave_exit); | 66 | module_exit(cpufreq_gov_powersave_exit); |