]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"
authorJohn Stultz <john.stultz@linaro.org>
Tue, 18 Jun 2013 02:34:57 +0000 (19:34 -0700)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 18 Jun 2013 23:02:04 +0000 (16:02 -0700)
commit1f0e4882f2637a7a52fbf32a39c1db5aecfa4ce5
treedc804dda28981d7a1095785658846fa5428af530
parente9bdda05d225c8255c481458d321c52e71ef9589
Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"

This reverts commit c2ffba78db250b642b8741f8a912af874522a1ae.

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