]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: 7894/1: kconfig: select GENERIC_CLOCKEVENTS if HAVE_ARM_ARCH_TIMER
authorWill Deacon <will.deacon@arm.com>
Tue, 19 Nov 2013 14:46:17 +0000 (15:46 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 20 Nov 2013 23:05:53 +0000 (23:05 +0000)
The ARM architected timer driver doesn't compile without
GENERIC_CLOCKEVENTS selected, so ensure that we select it when building
for a platform that has the timer.

Without this patch, mach-virt fails to build without something like
mach-vexpress also selected.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig

index 085b31ba287adbed26c4638f17a6debf494f604e..c2a372a6994f239ab60f97de6b1caac026cc1ddf 100644 (file)
@@ -1496,6 +1496,7 @@ config HAVE_ARM_ARCH_TIMER
        bool "Architected timer support"
        depends on CPU_V7
        select ARM_ARCH_TIMER
+       select GENERIC_CLOCKEVENTS
        help
          This option enables support for the ARM architected timer