Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic...

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

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 8a1479fc64793f7d140ee95a64fd3328517a2e32..68161f7a07d6c8bef677fdd04bb2a1b20715a664 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -18,6 +18,9 @@ config CLKBLD_I8253
 config CLKSRC_MMIO
        bool
 
+config DIGICOLOR_TIMER
+       bool
+
 config DW_APB_TIMER
        bool
 
@@ -26,6 +29,10 @@ config DW_APB_TIMER_OF
        select DW_APB_TIMER
        select CLKSRC_OF
 
+config ROCKCHIP_TIMER
+       bool
+       select CLKSRC_OF
+
 config ARMADA_370_XP_TIMER
        bool
        select CLKSRC_OF
@@ -47,12 +54,20 @@ config SUN5I_HSTIMER
        select CLKSRC_MMIO
        bool
 
+config TEGRA_TIMER
+       bool
+
 config VT8500_TIMER
        bool
 
 config CADENCE_TTC_TIMER
        bool
 
+config ASM9260_TIMER
+       bool
+       select CLKSRC_MMIO
+       select CLKSRC_OF
+
 config CLKSRC_NOMADIK_MTU
        bool
        depends on (ARCH_NOMADIK || ARCH_U8500)
@@ -235,5 +250,4 @@ config CLKSRC_PXA
        help
          This enables OST0 support available on PXA and SA-11x0
          platforms.
-
 endmenu