diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-12 15:32:01 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-12 15:32:01 -0400 |
| commit | 7d428ce284fce4aacb215ca15d0274e7261864a3 (patch) | |
| tree | 2eef7a50a2a31989bf0af1858a46c3de2dbd9648 /include/linux | |
| parent | 6f39ef575df368ed77fcaa2f1d0f28191c7414fc (diff) | |
| parent | 10021488997317d1121505a7ac659124c058efed (diff) | |
Merge tag 'dw_apb_timer_of' of git://github.com/mmind/linux-rockchip into next/drivers
From Heiko Stuebner, enhancements for dw_apb_timer:
- use DECLARE_CLOCKSOURCE_OF and convert its users
- handle the sptimer not being present as sched_clock
- add optional handling of timer clocks
* tag 'dw_apb_timer_of' of git://github.com/mmind/linux-rockchip:
clocksource: dw_apb_timer_of: use clocksource_of_init
clocksource: dw_apb_timer_of: select DW_APB_TIMER
clocksource: dw_apb_timer_of: add clock-handling
clocksource: dw_apb_timer_of: enable the use the clocksource as sched clock
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dw_apb_timer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/dw_apb_timer.h b/include/linux/dw_apb_timer.h index dd755ce2a5eb..07261d52a6df 100644 --- a/include/linux/dw_apb_timer.h +++ b/include/linux/dw_apb_timer.h | |||
| @@ -53,5 +53,4 @@ void dw_apb_clocksource_start(struct dw_apb_clocksource *dw_cs); | |||
| 53 | cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs); | 53 | cycle_t dw_apb_clocksource_read(struct dw_apb_clocksource *dw_cs); |
| 54 | void dw_apb_clocksource_unregister(struct dw_apb_clocksource *dw_cs); | 54 | void dw_apb_clocksource_unregister(struct dw_apb_clocksource *dw_cs); |
| 55 | 55 | ||
| 56 | extern void dw_apb_timer_init(void); | ||
| 57 | #endif /* __DW_APB_TIMER_H__ */ | 56 | #endif /* __DW_APB_TIMER_H__ */ |