summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-11-21 11:31:46 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2011-12-06 10:46:44 +0100
commit69881435c6ff34afb174e9e5c98fd6c395f0e5ff (patch)
tree6e0144ecf41c62c2cd93858e338eb437aa1d1391
parente2552bccade638d3d4213aff227f99afff540c00 (diff)
clocksource: break dependencies with BOOTTIME for topic branches isolation
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
-rw-r--r--drivers/clocksource/clksrc-dbx500-prcmu.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clocksource/clksrc-dbx500-prcmu.c b/drivers/clocksource/clksrc-dbx500-prcmu.c
index c2f4616ff57..99fbda39ab7 100644
--- a/drivers/clocksource/clksrc-dbx500-prcmu.c
+++ b/drivers/clocksource/clksrc-dbx500-prcmu.c
@@ -14,7 +14,9 @@
*/
#include <linux/clockchips.h>
#include <linux/clksrc-dbx500-prcmu.h>
+#ifdef CONFIG_BOOTTIME
#include <linux/boottime.h>
+#endif
#include <asm/sched_clock.h>
@@ -119,6 +121,7 @@ void __init clksrc_dbx500_prcmu_init(void)
clocksource_calc_mult_shift(&clocksource_dbx500_prcmu,
RATE_32K, SCHED_CLOCK_MIN_WRAP);
clocksource_register(&clocksource_dbx500_prcmu);
-
+#ifdef CONFIG_BOOTTIME
boottime_activate(&boottime_timer);
+#endif
}