diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 10:28:36 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 10:28:36 +0000 |
| commit | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (patch) | |
| tree | 225262f25e7b6518b47fbf68b1311cee61e3ad83 /arch/arm/Kconfig | |
| parent | 5b91ab0abc957145c3ff6be03eb9a3901797019f (diff) | |
| parent | 8266891e252f35dcb189c3f2371cfa588f8a8818 (diff) | |
| download | op-kernel-dev-9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a.zip op-kernel-dev-9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a.tar.gz | |
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/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 65ae737..9e8c0be 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 |
