projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'from-linus' into upstream
[powerpc.git]
/
drivers
/
cpufreq
/
cpufreq.c
diff --git
a/drivers/cpufreq/cpufreq.c
b/drivers/cpufreq/cpufreq.c
index
9759d05
..
29b2fa5
100644
(file)
--- a/
drivers/cpufreq/cpufreq.c
+++ b/
drivers/cpufreq/cpufreq.c
@@
-1497,7
+1497,7
@@
int cpufreq_update_policy(unsigned int cpu)
}
EXPORT_SYMBOL(cpufreq_update_policy);
-static int
__cpuinit
cpufreq_cpu_callback(struct notifier_block *nfb,
+static int cpufreq_cpu_callback(struct notifier_block *nfb,
unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;