summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/Makefile
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-01-19 10:07:38 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-19 11:11:36 +0000
commitcdab142a80d859984eb5e3876e0e762b1f0bded9 (patch)
tree85f212da3ef394d2c25c343ee5fd911f6d4695f2 /arch/arm/mach-vexpress/Makefile
parentc41b16f8c9d9dc74ed5669d4a3e3d42374c9e609 (diff)
downloadlinux-stable-cdab142a80d859984eb5e3876e0e762b1f0bded9.tar.gz
linux-stable-cdab142a80d859984eb5e3876e0e762b1f0bded9.tar.bz2
linux-stable-cdab142a80d859984eb5e3876e0e762b1f0bded9.zip
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>
Diffstat (limited to 'arch/arm/mach-vexpress/Makefile')
-rw-r--r--arch/arm/mach-vexpress/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index 2c0ac7de2814..cfe344ec1d6d 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -6,4 +6,3 @@ obj-y := v2m.o
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
-obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o