diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:28:36 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:28:36 -0500 |
| commit | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (patch) | |
| tree | 225262f25e7b6518b47fbf68b1311cee61e3ad83 /arch/arm/Kconfig | |
| parent | 5b91ab0abc957145c3ff6be03eb9a3901797019f (diff) | |
| parent | 8266891e252f35dcb189c3f2371cfa588f8a8818 (diff) | |
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 65ae7375c6c1..9e8c0be7b5ca 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1573,9 +1573,10 @@ config HAVE_ARM_SCU | |||
| 1573 | help | 1573 | help |
| 1574 | This option enables support for the ARM system coherency unit | 1574 | This option enables support for the ARM system coherency unit |
| 1575 | 1575 | ||
| 1576 | config ARM_ARCH_TIMER | 1576 | config HAVE_ARM_ARCH_TIMER |
| 1577 | bool "Architected timer support" | 1577 | bool "Architected timer support" |
| 1578 | depends on CPU_V7 | 1578 | depends on CPU_V7 |
| 1579 | select ARM_ARCH_TIMER | ||
| 1579 | help | 1580 | help |
| 1580 | This option enables support for the ARM architected timer | 1581 | This option enables support for the ARM architected timer |
| 1581 | 1582 | ||