Merge tag 'nfsd-4.3' of git://linux-nfs.org/~bfields/linux

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

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 4e57730e0be4e919203e21e070fb43666bb7b61d..a7726db13abbb0e883ec5681fec65a473bc9d29e 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -111,6 +111,10 @@ config CLKSRC_LPC32XX
        select CLKSRC_MMIO
        select CLKSRC_OF
 
+config CLKSRC_PISTACHIO
+       bool
+       select CLKSRC_OF
+
 config CLKSRC_STM32
        bool "Clocksource for STM32 SoCs" if !ARCH_STM32
        depends on OF && ARM && (ARCH_STM32 || COMPILE_TEST)
@@ -277,7 +281,7 @@ config CLKSRC_MIPS_GIC
 
 config CLKSRC_PXA
        def_bool y if ARCH_PXA || ARCH_SA1100
-       select CLKSRC_OF if USE_OF
+       select CLKSRC_OF if OF
        help
          This enables OST0 support available on PXA and SA-11x0
          platforms.
@@ -293,4 +297,12 @@ config CLKSRC_IMX_GPT
        depends on ARM && CLKDEV_LOOKUP
        select CLKSRC_MMIO
 
+config CLKSRC_ST_LPC
+       bool
+       depends on ARCH_STI
+       select CLKSRC_OF if OF
+       help
+         Enable this option to use the Low Power controller timer
+         as clocksource.
+
 endmenu