summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-02-01 10:28:36 +0000
committerWill Deacon <will.deacon@arm.com>2013-02-01 10:28:36 +0000
commit9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (patch)
tree225262f25e7b6518b47fbf68b1311cee61e3ad83 /arch/arm/Kconfig
parent5b91ab0abc957145c3ff6be03eb9a3901797019f (diff)
parent8266891e252f35dcb189c3f2371cfa588f8a8818 (diff)
downloadlinux-9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a.tar.bz2
Merge branch 'for-will/arch-timer-unification' of git://linux-arm.org/linux-mr into for-arm-soc/arch-timers
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 65ae7375c6c1..9e8c0be7b5ca 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1573,9 +1573,10 @@ config HAVE_ARM_SCU
help
This option enables support for the ARM system coherency unit
-config ARM_ARCH_TIMER
+config HAVE_ARM_ARCH_TIMER
bool "Architected timer support"
depends on CPU_V7
+ select ARM_ARCH_TIMER
help
This option enables support for the ARM architected timer