Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

[karo-tx-linux.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 2c27b02f0860fe054a820b71ce541c370def942f..065131cbfcc01b9c2f32b70600882c124dca4e06 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -136,6 +136,11 @@ config CLKSRC_SAMSUNG_PWM
          for all devicetree enabled platforms. This driver will be
          needed only on systems that do not have the Exynos MCT available.
 
+config FSL_FTM_TIMER
+       bool
+       help
+         Support for Freescale FlexTimer Module (FTM) timer.
+
 config VF_PIT_TIMER
        bool
        help
@@ -194,7 +199,7 @@ config CLKSRC_QCOM
 
 config CLKSRC_VERSATILE
        bool "ARM Versatile (Express) reference platforms clock source"
-       depends on GENERIC_SCHED_CLOCK
+       depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
        select CLKSRC_OF
        default y if MFD_VEXPRESS_SYSREG
        help