diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-27 10:56:55 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-27 10:56:55 +0000 |
| commit | 23e613732fd79b3105aa298427d3d63376a1b9d7 (patch) | |
| tree | 527f822248ec4f3f452dcc35cb577b5910b02d34 | |
| parent | 8a2e77d79f79c22ba7d6887e4003ffae529f1a57 (diff) | |
| parent | 83a29e9801d6d52635c9e05b45f89fb86a20022b (diff) | |
| download | vexpress-lsk-linux-linaro-lsk-v3.10.tar.gz | |
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lskHEADlinux-linaro-lsk-v3.10linux-linaro-lsk
| -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 1db214b2660..66733f1d55d 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; @@ -423,6 +425,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) { @@ -447,6 +450,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) { @@ -454,15 +458,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(); } |