aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2014-09-08 11:03:45 +0530
committerAmit Pundir <amit.pundir@linaro.org>2014-09-08 11:03:45 +0530
commitbce75d40706fae43e949a878cb8783e743405f45 (patch)
tree3fa149ccf28645e6cc46065827efc7df5f7d3b45 /drivers
parent4f1d8e6268ed69b913f9d7030668416e4e74ee3a (diff)
parent42df511db0372b4878b322d812b975e4632a2928 (diff)
Merge branch 'upstream/android-3.10' into 'linaro-fixes/android-3.10'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cpufreq/cpufreq_interactive.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c
index 437aaed57057..72563be3537c 100644
--- a/drivers/cpufreq/cpufreq_interactive.c
+++ b/drivers/cpufreq/cpufreq_interactive.c
@@ -117,7 +117,7 @@ struct cpufreq_interactive_tunables {
};
/* For cases where we have single governor instance for system */
-struct cpufreq_interactive_tunables *common_tunables;
+static struct cpufreq_interactive_tunables *common_tunables;
static struct attribute_group *get_sysfs_attr(void);