From a9a8266a899a454c4357f44885fbeaba0aa8b501 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Mon, 30 Jan 2017 13:55:23 +0530 Subject: [PATCH] ANDROID: cpufreq: conservative: fix duplicate 'static' error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix following duplicate 'static' declaration error: drivers/cpufreq/cpufreq_conservative.c:308:1: error: duplicate ‘static’ static struct dbs_governor cs_governor = { ^ scripts/Makefile.build:293: recipe for target 'drivers/cpufreq/cpufreq_conservative.o' failed Fixes: ("ANDROID: [CPUFREQ] Don't export governors for default governor") Signed-off-by: Amit Pundir --- drivers/cpufreq/cpufreq_conservative.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index afa0364196e3..e8e16a5dbd1e 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -305,7 +305,7 @@ static void cs_start(struct cpufreq_policy *policy) #ifndef CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE static #endif -static struct dbs_governor cs_governor = { +struct dbs_governor cs_governor = { .gov = CPUFREQ_DBS_GOVERNOR_INITIALIZER("conservative"), .kobj_type = { .default_attrs = cs_attributes }, .gov_dbs_timer = cs_dbs_timer,