commit cdab142a80d859984eb5e3876e0e762b1f0bded9
author Russell King <rmk+kernel@arm.linux.org.uk> Wed Jan 19 10:07:38 2011 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sat Feb 19 11:11:36 2011 +0000
tree 85f212da3ef394d2c25c343ee5fd911f6d4695f2
parent c41b16f8c9d9dc74ed5669d4a3e3d42374c9e609

ARM: realview/vexpress: consolidate localtimer support

Realview and Versatile Express local timer support is identical, so
consolidate the implementations.

Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/plat-versatile/Makefile

diff --git a/arch/arm/plat-versatile/Makefile b/arch/arm/plat-versatile/Makefile
index 41f57f4..b511abb 100644
--- a/arch/arm/plat-versatile/Makefile
+++ b/arch/arm/plat-versatile/Makefile
@@ -1,4 +1,5 @@
 obj-y	:= clock.o
+obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o
 obj-$(CONFIG_PLAT_VERSATILE_CLCD) += clcd.o
 obj-$(CONFIG_PLAT_VERSATILE_FPGA_IRQ) += fpga-irq.o
 obj-$(CONFIG_PLAT_VERSATILE_LEDS) += leds.o