summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-virt
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2013-03-20 13:57:38 +0000
committerMark Rutland <mark.rutland@arm.com>2013-06-07 10:20:28 +0100
commitfb521a0da1551468a45f2e2a1c1941d0033357ea (patch)
tree9b69236c36526b6e2fb0f4c41f64b6edf65e83e1 /arch/arm/mach-virt
parent0d651e4e65e96989f72236bf83bd4c6e55eb6ce4 (diff)
downloadlinux-stable-fb521a0da1551468a45f2e2a1c1941d0033357ea.tar.gz
linux-stable-fb521a0da1551468a45f2e2a1c1941d0033357ea.tar.bz2
linux-stable-fb521a0da1551468a45f2e2a1c1941d0033357ea.zip
arm: fix up ARM_ARCH_TIMER selects
In 8a4da6e: "arm: arch_timer: move core to drivers/clocksource", the selection of ARM_ARCH_TIMER was indirected via HAVE_ARM_ARCH_TIMER, though mach-exynos's selection of ARM_ARCH_TIMER was missed, and since then mach-shmobile, mach-tegra, and mach-virt have begun selecting ARM_ARCH_TIMER. This can lead to architected timer support erroneously appearing to not be selected in menuconfig. This patch fixes up the Kconfigs for those platforms to select HAVE_ARM_ARCH_TIMER. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Stephen Warren <swarren@nvidia.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Acked-by: Simon Horman <horms+renesas@verge.net.au> Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm/mach-virt')
-rw-r--r--arch/arm/mach-virt/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-virt/Kconfig b/arch/arm/mach-virt/Kconfig
index 8958f0d896bc..081d46929436 100644
--- a/arch/arm/mach-virt/Kconfig
+++ b/arch/arm/mach-virt/Kconfig
@@ -2,7 +2,7 @@ config ARCH_VIRT
bool "Dummy Virtual Machine" if ARCH_MULTI_V7
select ARCH_WANT_OPTIONAL_GPIOLIB
select ARM_GIC
- select ARM_ARCH_TIMER
+ select HAVE_ARM_ARCH_TIMER
select ARM_PSCI
select HAVE_SMP
select CPU_V7