aboutsummaryrefslogtreecommitdiff
path: root/kernel/time/tick-common.c
diff options
context:
space:
mode:
authorGravatar John Stultz <john.stultz@linaro.org> 2013-06-17 19:34:57 -0700
committerGravatar John Stultz <john.stultz@linaro.org> 2013-06-18 16:02:04 -0700
commitd3d8fee4138a06b4b9ca172d25b8412fc33ad3f3 (patch)
treedc804dda28981d7a1095785658846fa5428af530 /kernel/time/tick-common.c
parentARM: sched_clock: Load cycle count after epoch stabilizes (diff)
downloadlinux-d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3.tar.gz
linux-d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3.tar.bz2
linux-d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3.zip
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>
Diffstat (limited to 'kernel/time/tick-common.c')
0 files changed, 0 insertions, 0 deletions