diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2013-03-20 09:57:38 -0400 |
|---|---|---|
| committer | Mark Rutland <mark.rutland@arm.com> | 2013-06-07 05:20:28 -0400 |
| commit | fb521a0da1551468a45f2e2a1c1941d0033357ea (patch) | |
| tree | 9b69236c36526b6e2fb0f4c41f64b6edf65e83e1 /arch/arm/mach-tegra | |
| parent | 0d651e4e65e96989f72236bf83bd4c6e55eb6ce4 (diff) | |
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-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 84d72fc36dfe..65c5ae6fa386 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig | |||
| @@ -60,7 +60,7 @@ config ARCH_TEGRA_3x_SOC | |||
| 60 | 60 | ||
| 61 | config ARCH_TEGRA_114_SOC | 61 | config ARCH_TEGRA_114_SOC |
| 62 | bool "Enable support for Tegra114 family" | 62 | bool "Enable support for Tegra114 family" |
| 63 | select ARM_ARCH_TIMER | 63 | select HAVE_ARM_ARCH_TIMER |
| 64 | select ARM_GIC | 64 | select ARM_GIC |
| 65 | select ARM_L1_CACHE_SHIFT_6 | 65 | select ARM_L1_CACHE_SHIFT_6 |
| 66 | select CPU_FREQ_TABLE if CPU_FREQ | 66 | select CPU_FREQ_TABLE if CPU_FREQ |