diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-27 10:57:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-27 10:57:19 +0000 |
| commit | 587c7ba6ba7bb550269695822abe9f8c2882040b (patch) | |
| tree | c129e4680fdb86d32dea02a3946feda332666551 /drivers/cpufreq | |
| parent | f41a52ee6767653f23794ccc7f342d5628c2f6f7 (diff) | |
| parent | 23e613732fd79b3105aa298427d3d63376a1b9d7 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_stats.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 7dc9c4efbcf..038c7cca0cf 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c @@ -21,7 +21,9 @@ #include <linux/spinlock.h> #include <linux/notifier.h> #include <asm/cputime.h> +#ifdef CONFIG_BL_SWITCHER #include <asm/bL_switcher.h> +#endif static spinlock_t cpufreq_stats_lock; @@ -448,6 +450,7 @@ static void cpufreq_stats_cleanup(void) } } +#ifdef CONFIG_BL_SWITCHER static int cpufreq_stats_switcher_notifier(struct notifier_block *nfb, unsigned long action, void *_arg) { @@ -472,6 +475,7 @@ static int cpufreq_stats_switcher_notifier(struct notifier_block *nfb, static struct notifier_block switcher_notifier = { .notifier_call = cpufreq_stats_switcher_notifier, }; +#endif static int __init cpufreq_stats_init(void) { @@ -479,15 +483,18 @@ static int __init cpufreq_stats_init(void) spin_lock_init(&cpufreq_stats_lock); ret = cpufreq_stats_setup(); +#ifdef CONFIG_BL_SWITCHER if (!ret) bL_switcher_register_notifier(&switcher_notifier); - +#endif return ret; } static void __exit cpufreq_stats_exit(void) { +#ifdef CONFIG_BL_SWITCHER bL_switcher_unregister_notifier(&switcher_notifier); +#endif cpufreq_stats_cleanup(); } |