diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:12:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-18 20:12:56 +0100 |
| commit | fd8957a96d535a992067b2c206672323a885454a (patch) | |
| tree | 136bedf882a14924f76f059977e40eda038ae5c9 /arch/arm/mach-virt | |
| parent | 3fbd55ec21e698221ffb43526090137b07c32586 (diff) | |
| parent | 3f71be237ce37e0131973ebfa33b326bc51d743e (diff) | |
Merge branch 'for-rmk/arch-timer-cleanups' of git://linux-arm.org/linux-mr into devel-stable
Please pull these arch_timer cleanups I've been holding onto for a while.
They're the same as my last posting [1], but have been rebased to v3.10-rc3.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-May/170602.html
-- Mark Rutland
Diffstat (limited to 'arch/arm/mach-virt')
| -rw-r--r-- | arch/arm/mach-virt/Kconfig | 2 |
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 |