Merge branches 'amba', 'devel-stable', 'fixes', 'mach-types', 'mmci', 'pci' and ...

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 36586dba6fa6e0af6260dce3827cfe1495c7f592..ed244933b256e83712d63bc37c914543b5acba6a 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -280,6 +280,7 @@ config ARCH_INTEGRATOR
        select NEED_MACH_IO_H
        select NEED_MACH_MEMORY_H
        select SPARSE_IRQ
+       select MULTI_IRQ_HANDLER
        help
          Support for ARM's Integrator platform.
 
@@ -1552,6 +1553,12 @@ config HAVE_ARM_SCU
        help
          This option enables support for the ARM system coherency unit
 
+config ARM_ARCH_TIMER
+       bool "Architected timer support"
+       depends on CPU_V7
+       help
+         This option enables support for the ARM architected timer
+
 config HAVE_ARM_TWD
        bool
        depends on SMP