From 7b524ee21b4a8639f9397dac7866aa7d7ca4199d Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Fri, 26 Oct 2012 00:51:32 +0200
Subject: [PATCH] --- yaml --- r: 336710 b: refs/heads/master c:
 da58445570326ac2a342770a9c9a2646276e1721 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c33c7fc19ab7..8172a2ba2531 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e7586a18a2ab69a160837c0a4be31f7147cfb5e
+refs/heads/master: da58445570326ac2a342770a9c9a2646276e1721
diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c
index f552d5fe0f8f..261ef654a352 100644
--- a/trunk/drivers/cpufreq/cpufreq.c
+++ b/trunk/drivers/cpufreq/cpufreq.c
@@ -129,7 +129,7 @@ static int __init init_cpufreq_transition_notifier_list(void)
 pure_initcall(init_cpufreq_transition_notifier_list);
 
 static int off __read_mostly;
-int cpufreq_disabled(void)
+static int cpufreq_disabled(void)
 {
 	return off;
 }