Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...

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

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 14c7c47..39aa21d 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -79,6 +79,7 @@ config IXP4XX_TIMER
        bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST
        depends on HAS_IOMEM
        select CLKSRC_MMIO
+       select TIMER_OF if OF
        help
          Enables support for the Intel XScale IXP4xx SoC timer.
 
@@ -197,12 +198,6 @@ config CLPS711X_TIMER
        help
          Enables support for the Cirrus Logic PS711 timer.
 
-config ATLAS7_TIMER
-       bool "Atlas7 timer driver" if COMPILE_TEST
-       select CLKSRC_MMIO
-       help
-         Enables support for the Atlas7 timer.
-
 config MXS_TIMER
        bool "MXS timer driver" if COMPILE_TEST
        select CLKSRC_MMIO
@@ -210,19 +205,6 @@ config MXS_TIMER
        help
          Enables support for the MXS timer.
 
-config PRIMA2_TIMER
-       bool "Prima2 timer driver" if COMPILE_TEST
-       select CLKSRC_MMIO
-       help
-         Enables support for the Prima2 timer.
-
-config U300_TIMER
-       bool "U300 timer driver" if COMPILE_TEST
-       depends on ARM
-       select CLKSRC_MMIO
-       help
-         Enables support for the U300 timer.
-
 config NSPIRE_TIMER
        bool "NSpire timer driver" if COMPILE_TEST
        select CLKSRC_MMIO
@@ -242,15 +224,6 @@ config INTEGRATOR_AP_TIMER
        help
          Enables support for the Integrator-AP timer.
 
-config CLKSRC_EFM32
-       bool "Clocksource for Energy Micro's EFM32 SoCs" if !ARCH_EFM32
-       depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
-       select CLKSRC_MMIO
-       default ARCH_EFM32
-       help
-         Support to use the timers of EFM32 SoCs as clock source and clock
-         event device.
-
 config CLKSRC_LPC32XX
        bool "Clocksource for LPC32XX" if COMPILE_TEST
        depends on HAS_IOMEM
@@ -567,14 +540,6 @@ config CLKSRC_MIPS_GIC
        select CLOCKSOURCE_WATCHDOG
        select TIMER_OF
 
-config CLKSRC_TANGO_XTAL
-       bool "Clocksource for Tango SoC" if COMPILE_TEST
-       depends on ARM
-       select TIMER_OF
-       select CLKSRC_MMIO
-       help
-         This enables the clocksource for Tango SoC.
-
 config CLKSRC_PXA
        bool "Clocksource for PXA or SA-11x0 platform" if COMPILE_TEST
        depends on HAS_IOMEM