diff options
| author | Nishanth Menon <nm@ti.com> | 2011-07-24 15:57:47 -0400 |
|---|---|---|
| committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:18:03 -0400 |
| commit | 37ebde996aa6c080eba4518b5e67d36275d9b5b8 (patch) | |
| tree | 6992135094a64f03a0e4ab8083bad9a261c85504 /include/linux | |
| parent | c4210b69286bea72b1c4e973d32a285b69f13ca8 (diff) | |
Merge branch 'v3.0-4460-fixes' into omap-pm-integration
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clockchips.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index d6733e27af3..267ba73a5f2 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -144,6 +144,8 @@ extern int clockevents_program_event(struct clock_event_device *dev, | |||
| 144 | 144 | ||
| 145 | extern void clockevents_handle_noop(struct clock_event_device *dev); | 145 | extern void clockevents_handle_noop(struct clock_event_device *dev); |
| 146 | 146 | ||
| 147 | extern int clockevents_reconfigure(struct clock_event_device *ce, u32 freq, u32 minsec); | ||
| 148 | |||
| 147 | static inline void | 149 | static inline void |
| 148 | clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) | 150 | clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) |
| 149 | { | 151 | { |