aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-11-19 09:46:17 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-11-20 18:05:53 -0500
commit0c403462d6822227ea37fb0293a3e9f511e6929f (patch)
tree34f5a6043cdb7015ca7146bfb28437dbe69ce712 /arch/arm
parentb7ec699405f55667caeb46d96229d75bf33a83ad (diff)
ARM: 7894/1: kconfig: select GENERIC_CLOCKEVENTS if HAVE_ARM_ARCH_TIMER
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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 085b31ba287a..c2a372a6994f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1496,6 +1496,7 @@ config HAVE_ARM_ARCH_TIMER
1496 bool "Architected timer support" 1496 bool "Architected timer support"
1497 depends on CPU_V7 1497 depends on CPU_V7
1498 select ARM_ARCH_TIMER 1498 select ARM_ARCH_TIMER
1499 select GENERIC_CLOCKEVENTS
1499 help 1500 help
1500 This option enables support for the ARM architected timer 1501 This option enables support for the ARM architected timer
1501 1502