diff options
| author | Scott Wood <scottwood@freescale.com> | 2006-12-10 05:19:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-10 12:55:40 -0500 |
| commit | 884b4aaaa242a2db8c8252796f0118164a680ab5 (patch) | |
| tree | eea898cb8df58cace0a04025b5efdb8b2a2fd3d2 /include/linux/rtc.h | |
| parent | 9080d0ae0fd16628d688ce7d03d02ccf7011c6f0 (diff) | |
[PATCH] rtc: Add rtc_merge_alarm()
Add rtc_merge_alarm(), which can be used by rtc drivers to turn a partially
specified alarm expiry (i.e. most significant fields set to -1, as with the
RTC_ALM_SET ioctl()) into a fully specified expiry.
If the most significant specified field is earlier than the current time, the
least significant unspecified field is incremented.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux/rtc.h')
| -rw-r--r-- | include/linux/rtc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 09ff4c3e2713..5e22d4510d11 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
| @@ -106,6 +106,7 @@ extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year | |||
| 106 | extern int rtc_valid_tm(struct rtc_time *tm); | 106 | extern int rtc_valid_tm(struct rtc_time *tm); |
| 107 | extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time); | 107 | extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time); |
| 108 | extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm); | 108 | extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm); |
| 109 | extern void rtc_merge_alarm(struct rtc_time *now, struct rtc_time *alarm); | ||
| 109 | 110 | ||
| 110 | #include <linux/device.h> | 111 | #include <linux/device.h> |
| 111 | #include <linux/seq_file.h> | 112 | #include <linux/seq_file.h> |