summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-11-19 14:46:17 (GMT)
committerMatthew Weigel <Matthew.Weigel@freescale.com>2014-12-11 18:39:57 (GMT)
commitd5dde7342868396d461b47ec0862d138aae75dbb (patch)
tree939307b33a6fa46a0e2339f8be40e6c3abcfd66d
parenta6dd9146c360d5414292ce6146ea7c63fc4a1dc1 (diff)
downloadlinux-fsl-qoriq-d5dde7342868396d461b47ec0862d138aae75dbb.tar.xz
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> (cherry picked from commit 0c403462d6822227ea37fb0293a3e9f511e6929f) Change-Id: I349317968df072d8539702adcf376e4bea4b43cb Reviewed-on: http://git.am.freescale.net:8181/22055 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Zhengxiong Jin <Jason.Jin@freescale.com>
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2ec9220..0d29536 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1532,6 +1532,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