Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"
commitd3d8fee4138a06b4b9ca172d25b8412fc33ad3f3
authorJohn Stultz <john.stultz@linaro.org>
Tue, 18 Jun 2013 02:34:57 +0000 (17 19:34 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 18 Jun 2013 23:02:04 +0000 (18 16:02 -0700)
treedc804dda28981d7a1095785658846fa5428af530
parent336ae1180df5f69b9e0fb6561bec01c5f64361cf
Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"

This reverts commit 55a68c23e0a675b2b8ac2656fd6edbf98b78e4c6.

In order to avoid a collision with dw_apb_timer changes in
the arm-soc tree, revert this change.

I'm leaving it to the arm-soc folks to sort out if they want
to keep the other side of the collision or if they're just going
to back it all out and try again during the next release cycle.

Reported-by: Dinh Nguyen <dinguyen@altera.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
arch/arm/mach-picoxcell/common.h
drivers/clocksource/dw_apb_timer.c
drivers/clocksource/dw_apb_timer_of.c
include/linux/dw_apb_timer.h