Merge tag 'soc-for-linus' 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 c062b6105d494ef804ebd4c5389b92ec4130a873..1c2506f68122567df92d6197990ee1b015d0984f 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
@@ -232,4 +239,21 @@ config CLKSRC_MIPS_GIC
        depends on MIPS_GIC
        select CLKSRC_OF
 
+config CLKSRC_PXA
+       def_bool y if ARCH_PXA || ARCH_SA1100
+       select CLKSRC_OF if USE_OF
+       help
+         This enables OST0 support available on PXA and SA-11x0
+         platforms.
+
+config ASM9260_TIMER
+       bool "Alphascale ASM9260 timer driver"
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       select CLKSRC_OF
+       default y if MACH_ASM9260
+       help
+         This enables build of a clocksource and clockevent driver for
+         the 32-bit System Timer hardware available on a Alphascale ASM9260.
+
 endmenu