Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 3a1efa3fd88d2d4a0809b9560fb8330953f1e345..71cfdf7c97086273b1cc8ae1235ecf919abcfda1 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -2,6 +2,14 @@ menu "Clock Source drivers"
 
 config CLKSRC_OF
        bool
+       select CLKSRC_PROBE
+
+config CLKSRC_ACPI
+       bool
+       select CLKSRC_PROBE
+
+config CLKSRC_PROBE
+       bool
 
 config CLKSRC_I8253
        bool
@@ -131,6 +139,7 @@ config CLKSRC_STM32
 config ARM_ARCH_TIMER
        bool
        select CLKSRC_OF if OF
+       select CLKSRC_ACPI if ACPI
 
 config ARM_ARCH_TIMER_EVTSTREAM
        bool "Support for ARM architected timer event stream generation"
@@ -287,6 +296,10 @@ config CLKSRC_MIPS_GIC
        depends on MIPS_GIC
        select CLKSRC_OF
 
+config CLKSRC_TANGO_XTAL
+       bool
+       select CLKSRC_OF
+
 config CLKSRC_PXA
        def_bool y if ARCH_PXA || ARCH_SA1100
        select CLKSRC_OF if OF