Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[~andy/linux] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 81465c21f873ec37ec07213b62d81559a24335bf..b7b9b040a89ba807e36062c2029feedfceee8016 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -27,6 +27,11 @@ config DW_APB_TIMER_OF
 config ARMADA_370_XP_TIMER
        bool
 
+config ORION_TIMER
+       select CLKSRC_OF
+       select CLKSRC_MMIO
+       bool
+
 config SUN4I_TIMER
        bool
 
@@ -69,6 +74,19 @@ config ARM_ARCH_TIMER
        bool
        select CLKSRC_OF if OF
 
+config ARM_GLOBAL_TIMER
+       bool
+       select CLKSRC_OF if OF
+       help
+         This options enables support for the ARM global timer unit
+
+config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
+       bool
+       depends on ARM_GLOBAL_TIMER
+       default y
+       help
+        Use ARM global timer clock source as sched_clock
+
 config CLKSRC_METAG_GENERIC
        def_bool y if METAG
        help