git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
kernel
/
cpufreq.c
diff --git
a/arch/sh/kernel/cpufreq.c
b/arch/sh/kernel/cpufreq.c
index 71d1c427b9079771ecf2528a02ddf0559aef2232..e0590ffebd73f546af41b9a47453ab7eb09543ae 100644
(file)
--- a/
arch/sh/kernel/cpufreq.c
+++ b/
arch/sh/kernel/cpufreq.c
@@
-77,8
+77,6
@@
static int sh_cpufreq_target(struct cpufreq_policy *policy,
static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
{
- printk(KERN_INFO "cpufreq: SuperH CPU frequency driver.\n");
-
if (!cpu_online(policy->cpu))
return -ENODEV;
if (!cpu_online(policy->cpu))
return -ENODEV;
@@
-143,6
+141,7
@@
static struct cpufreq_driver sh_cpufreq_driver = {
static int __init sh_cpufreq_module_init(void)
{
static int __init sh_cpufreq_module_init(void)
{
+ printk(KERN_INFO "cpufreq: SuperH CPU frequency driver.\n");
return cpufreq_register_driver(&sh_cpufreq_driver);
}
return cpufreq_register_driver(&sh_cpufreq_driver);
}