aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/Makefile
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2010-05-10 15:53:00 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:08 -0600
commitcd073608c8a5bfecd06b4af404e435b92b6e99bf (patch)
treef06409c2b5fb3e3022c57c1ea85275079fe0938c /arch/arm/mach-ux500/Makefile
parent3347fc6e2c7b86d2cf6681749f9e1a434aed8911 (diff)
downloadlinux-2.6.34-ux500-cd073608c8a5bfecd06b4af404e435b92b6e99bf.tar.gz
mach-ux500: Use localtimer.c from mainline 2.6.33
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/Makefile')
-rwxr-xr-xarch/arm/mach-ux500/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index 2c2d8b0ab85..473801f5ca6 100755
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_CRYPTO_DEV_UX500_HASH), m)
CFLAGS_board-mop500.o += -DCONFIG_CRYPTO_DEV_UX500_HASH
endif
-obj-y := clock.o timer.o timer-rtt.o gpio.o
+obj-y := clock.o timer.o timer-rtt.o gpio.o localtimer.o
obj-$(CONFIG_REGULATOR) += regulator.o
obj-$(CONFIG_ARCH_U8500) += devices.o cpu.o
obj-$(CONFIG_STM_DMA) += dma_40.o #part1 no. of dma is 0x40