ARM: 8252/1: sa1100: use pxa_timer clocksource driver
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Sun, 21 Dec 2014 15:08:13 +0000 (16:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 14 Jan 2015 11:28:37 +0000 (11:28 +0000)
Use pxa_timer clocksource driver.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-sa1100/Makefile
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/time.c [deleted file]

Simple merge
Simple merge
diff --cc arch/arm/mach-sa1100/time.c
Simple merge