From da3ad2fcaf1f38adc496a96c8e3441878cc520a6 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 31 May 2010 09:28:30 +0100 Subject: [PATCH] --- yaml --- r: 200288 b: refs/heads/master c: b394eebdd3d436f1796e53b97799554c5aa77431 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/Makefile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f94c6b883cc5..5b246412a3a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3defb2476166445982a90c12d33f8947e75476c4 +refs/heads/master: b394eebdd3d436f1796e53b97799554c5aa77431 diff --git a/trunk/arch/arm/mach-ux500/Makefile b/trunk/arch/arm/mach-ux500/Makefile index c7bc4199e3a8..4556aea9c3c5 100644 --- a/trunk/arch/arm/mach-ux500/Makefile +++ b/trunk/arch/arm/mach-ux500/Makefile @@ -7,4 +7,5 @@ obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o devices-db5500.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o obj-$(CONFIG_MACH_U8500_MOP) += board-mop500.o obj-$(CONFIG_MACH_U5500) += board-u5500.o -obj-$(CONFIG_SMP) += platsmp.o headsmp.o localtimer.o +obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_LOCAL_TIMERS) += localtimer.o