From 079745e23779a118faabb6371e449bdfe2221d40 Mon Sep 17 00:00:00 2001
From: Satyam Sharma <satyam@infradead.org>
Date: Tue, 2 Oct 2007 13:28:14 -0700
Subject: [PATCH] --- yaml --- r: 67785 b: refs/heads/master c:
 dd184a01b8ece6bac2f7a63de99a4a4d29552746 h: refs/heads/master i:   67783:
 e3fbe00dc922d92fcae7e8a9e706519b112bca33 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/cpufreq/cpufreq.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 63c56e5ed21e..a3fc9f8e9e2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6afde10c3f58cc3ac593f5b4505b8b1cf719f5d6
+refs/heads/master: dd184a01b8ece6bac2f7a63de99a4a4d29552746
diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c
index 65ac58511228..e027052a6604 100644
--- a/trunk/drivers/cpufreq/cpufreq.c
+++ b/trunk/drivers/cpufreq/cpufreq.c
@@ -1730,7 +1730,7 @@ int cpufreq_update_policy(unsigned int cpu)
 }
 EXPORT_SYMBOL(cpufreq_update_policy);
 
-static int cpufreq_cpu_callback(struct notifier_block *nfb,
+static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
 					unsigned long action, void *hcpu)
 {
 	unsigned int cpu = (unsigned long)hcpu;