diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /include/linux/clockchips.h | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 81e803e90aa4..acba894374a1 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -132,6 +132,7 @@ extern u64 clockevent_delta2ns(unsigned long latch, | |||
| 132 | struct clock_event_device *evt); | 132 | struct clock_event_device *evt); |
| 133 | extern void clockevents_register_device(struct clock_event_device *dev); | 133 | extern void clockevents_register_device(struct clock_event_device *dev); |
| 134 | 134 | ||
| 135 | extern void clockevents_config(struct clock_event_device *dev, u32 freq); | ||
| 135 | extern void clockevents_config_and_register(struct clock_event_device *dev, | 136 | extern void clockevents_config_and_register(struct clock_event_device *dev, |
| 136 | u32 freq, unsigned long min_delta, | 137 | u32 freq, unsigned long min_delta, |
| 137 | unsigned long max_delta); | 138 | unsigned long max_delta); |