diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-12-13 16:45:48 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-12-13 16:48:21 -0500 |
commit | 96c8f06a0fb359a9a89701a7afab6d837e466ab0 (patch) | |
tree | 038d92c31b95abfd5ab83428ab965de82548c4c9 /include/linux/rtc.h | |
parent | 042620a018afcfba1d678062b62e463b9e43a68d (diff) |
rtc: Namespace fixup
rtctimer_* is already occupied by sound/core/rtctimer.c. Instead of
fiddling with that, rename the new functions to rtc_timer_* which
reads nicer anyway.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: John Stultz <johnstul@us.ibm.com>
Diffstat (limited to 'include/linux/rtc.h')
-rw-r--r-- | include/linux/rtc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 44e18a2523a3..3c995b4d742c 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
@@ -246,13 +246,13 @@ int rtc_register(rtc_task_t *task); | |||
246 | int rtc_unregister(rtc_task_t *task); | 246 | int rtc_unregister(rtc_task_t *task); |
247 | int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg); | 247 | int rtc_control(rtc_task_t *t, unsigned int cmd, unsigned long arg); |
248 | 248 | ||
249 | void rtctimer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer); | 249 | void rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer); |
250 | void rtctimer_remove(struct rtc_device *rtc, struct rtc_timer *timer); | 250 | void rtc_timer_remove(struct rtc_device *rtc, struct rtc_timer *timer); |
251 | void rtctimer_init(struct rtc_timer *timer, void (*f)(void* p), void* data); | 251 | void rtc_timer_init(struct rtc_timer *timer, void (*f)(void* p), void* data); |
252 | int rtctimer_start(struct rtc_device *rtc, struct rtc_timer* timer, | 252 | int rtc_timer_start(struct rtc_device *rtc, struct rtc_timer* timer, |
253 | ktime_t expires, ktime_t period); | 253 | ktime_t expires, ktime_t period); |
254 | int rtctimer_cancel(struct rtc_device *rtc, struct rtc_timer* timer); | 254 | int rtc_timer_cancel(struct rtc_device *rtc, struct rtc_timer* timer); |
255 | void rtctimer_do_work(struct work_struct *work); | 255 | void rtc_timer_do_work(struct work_struct *work); |
256 | 256 | ||
257 | static inline bool is_leap_year(unsigned int year) | 257 | static inline bool is_leap_year(unsigned int year) |
258 | { | 258 | { |