diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/cpufreq/cpufreq.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/cpufreq/cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index b03771d4787..2dafc5c38ae 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c | |||
| @@ -1782,7 +1782,7 @@ error_out: | |||
| 1782 | * cpufreq_update_policy - re-evaluate an existing cpufreq policy | 1782 | * cpufreq_update_policy - re-evaluate an existing cpufreq policy |
| 1783 | * @cpu: CPU which shall be re-evaluated | 1783 | * @cpu: CPU which shall be re-evaluated |
| 1784 | * | 1784 | * |
| 1785 | * Usefull for policy notifiers which have different necessities | 1785 | * Useful for policy notifiers which have different necessities |
| 1786 | * at different times. | 1786 | * at different times. |
| 1787 | */ | 1787 | */ |
| 1788 | int cpufreq_update_policy(unsigned int cpu) | 1788 | int cpufreq_update_policy(unsigned int cpu) |