]> 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)
commit3b614c0ba9efcc203423948590f4826173605f52
treedc804dda28981d7a1095785658846fa5428af530
parent5165643f98a0b1974d2bf0d59bd64196c030fdba
Revert "dw_apb_timer_of.c: Remove parts that were picoxcell-specific"

This reverts commit d31383e2fb7c7c8f204b37e2d6745e84dd8c416e.

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