Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 76194bc20bdf1709d3369855a4da1f8e4a6c9cd8..8e8a09755d10431e27f42479a08c8a6fb842ab0c 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -21,6 +21,9 @@ config CLKEVT_I8253
 config I8253_LOCK
        bool
 
+config OMAP_DM_TIMER
+       bool
+
 config CLKBLD_I8253
        def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK
 
@@ -394,16 +397,12 @@ config ATMEL_PIT
 
 config ATMEL_ST
        bool "Atmel ST timer support" if COMPILE_TEST
+       depends on HAS_IOMEM
        select TIMER_OF
        select MFD_SYSCON
        help
          Support for the Atmel ST timer.
 
-config CLKSRC_METAG_GENERIC
-       def_bool y if METAG
-       help
-         This option enables support for the Meta per-thread timers.
-
 config CLKSRC_EXYNOS_MCT
        bool "Exynos multi core timer driver" if COMPILE_TEST
        depends on ARM || ARM64
@@ -599,4 +598,13 @@ config CLKSRC_ST_LPC
          Enable this option to use the Low Power controller timer
          as clocksource.
 
+config ATCPIT100_TIMER
+       bool "ATCPIT100 timer driver"
+       depends on NDS32 || COMPILE_TEST
+       depends on HAS_IOMEM
+       select TIMER_OF
+       default NDS32
+       help
+         This option enables support for the Andestech ATCPIT100 timers.
+
 endmenu