summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2010-12-01 18:27:19 -0800
committerColin Cross <ccross@android.com>2010-12-01 18:27:19 -0800
commit0a11e95053a055d80be6184c51b82ea7e05c7cda (patch)
treef1fa6365a6bc36ad8d73b580ba020369580a80f3 /include
parent4ed4afb836315bbfc12f1fec212c771f0835c93a (diff)
parent04dcc0f8bf9be6ef1a6ffba049819fe8a2a7368d (diff)
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpufreq.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index c3e9de8321c6..e71e0f6ecd58 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -364,6 +364,9 @@ extern struct cpufreq_governor cpufreq_gov_ondemand;
#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE)
extern struct cpufreq_governor cpufreq_gov_conservative;
#define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_conservative)
+#elif defined(CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE)
+extern struct cpufreq_governor cpufreq_gov_interactive;
+#define CPUFREQ_DEFAULT_GOVERNOR (&cpufreq_gov_interactive)
#endif