ARM: ux500: convert to twd_local_timer_register() interface
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 10 Jan 2012 19:44:19 +0000 (19:44 +0000)
committerMarc Zyngier <marc.zyngier@arm.com>
Tue, 13 Mar 2012 13:45:33 +0000 (13:45 +0000)
Add support for the new smp_twd runtime registration interface
to the ux500 platforms, and remove the old compile-time support.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/localtimer.c [deleted file]
arch/arm/mach-ux500/timer.c

Simple merge
Simple merge
diff --cc arch/arm/mach-ux500/localtimer.c
Simple merge
Simple merge