Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[deliverable/linux.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 75bc7520ace530a02073e9118c45b8e9116d2dc2..e507ab7df60b88d6bae4a3f69e28d8f6845924cd 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -1,3 +1,6 @@
+config CLKSRC_OF
+       bool
+
 config CLKSRC_I8253
        bool
 
@@ -25,6 +28,9 @@ config ARMADA_370_XP_TIMER
 config SUNXI_TIMER
        bool
 
+config VT8500_TIMER
+       bool
+
 config CLKSRC_NOMADIK_MTU
        bool
        depends on (ARCH_NOMADIK || ARCH_U8500)
@@ -54,10 +60,8 @@ config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
        help
          Use the always on PRCMU Timer as sched_clock
 
-config CLKSRC_ARM_GENERIC
-       def_bool y if ARM64
-       help
-         This option enables support for the ARM generic timer.
+config ARM_ARCH_TIMER
+       bool
 
 config CLKSRC_METAG_GENERIC
        def_bool y if METAG