diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-06-17 19:34:57 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-06-18 16:02:04 -0700 |
| commit | d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3 (patch) | |
| tree | dc804dda28981d7a1095785658846fa5428af530 /include | |
| parent | 336ae1180df5f69b9e0fb6561bec01c5f64361cf (diff) | |
| download | linux-stable-d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3.tar.gz linux-stable-d3d8fee4138a06b4b9ca172d25b8412fc33ad3f3.tar.bz2 linux-stable-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 'include')
| -rw-r--r-- | include/linux/dw_apb_timer.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/dw_apb_timer.h b/include/linux/dw_apb_timer.h index de0904e38f33..b1cd9597c241 100644 --- a/include/linux/dw_apb_timer.h +++ b/include/linux/dw_apb_timer.h @@ -17,12 +17,6 @@ #include <linux/clocksource.h> #include <linux/interrupt.h> -#define APBTMR_N_LOAD_COUNT 0x00 -#define APBTMR_N_CURRENT_VALUE 0x04 -#define APBTMR_N_CONTROL 0x08 -#define APBTMR_N_EOI 0x0c -#define APBTMR_N_INT_STATUS 0x10 - #define APBTMRS_REG_SIZE 0x14 struct dw_apb_timer { |