From 93f379e6cfadfded0d262192ca69d1abc096d90e Mon Sep 17 00:00:00 2001 From: Benn Pörscke Date: Fri, 16 Dec 2011 15:04:55 +0100 Subject: Squash Change-Id: I2fcf46d1fc4b0cd4c61e5be3654c43b80db86015 --- drivers/clocksource/Kconfig | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'drivers/clocksource/Kconfig') diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 75935af43f2..a47a5837737 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -12,11 +12,9 @@ config CLKSRC_DBX500_PRCMU Use the always on PRCMU Timer as clocksource config CLKSRC_DBX500_PRCMU_SCHED_CLOCK - bool "Clocksource PRCMU Timer sched_clock" - depends on (CLKSRC_DBX500_PRCMU && !NOMADIK_MTU_SCHED_CLOCK && \ - !CLKSRC_DB5500_MTIMER_SCHED_CLOCK) + bool + depends on CLKSRC_DBX500_PRCMU select HAVE_SCHED_CLOCK - default y help Use the always on PRCMU Timer as sched_clock @@ -28,10 +26,8 @@ config CLKSRC_DB5500_MTIMER Use the always on MTIMER as clocksource config CLKSRC_DB5500_MTIMER_SCHED_CLOCK - bool "Clocksource MTIMER sched_clock" - depends on (CLKSRC_DB5500_MTIMER && !NOMADIK_MTU_SCHED_CLOCK && \ - !CLKSRC_DBX500_PRCMU_SCHED_CLOCK) + bool + depends on CLKSRC_DB5500_MTIMER select HAVE_SCHED_CLOCK - default y help Use the always on PRCMU Timer as sched_clock -- cgit v1.2.3