summaryrefslogtreecommitdiff
path: root/include/linux/rtc.h
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2006-12-10 02:19:00 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-10 09:55:40 -0800
commit884b4aaaa242a2db8c8252796f0118164a680ab5 (patch)
treeeea898cb8df58cace0a04025b5efdb8b2a2fd3d2 /include/linux/rtc.h
parent9080d0ae0fd16628d688ce7d03d02ccf7011c6f0 (diff)
downloadlinux-3.10-884b4aaaa242a2db8c8252796f0118164a680ab5.tar.gz
linux-3.10-884b4aaaa242a2db8c8252796f0118164a680ab5.tar.bz2
linux-3.10-884b4aaaa242a2db8c8252796f0118164a680ab5.zip
[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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 09ff4c3e271..5e22d4510d1 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
extern int rtc_valid_tm(struct rtc_time *tm);
extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time);
extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm);
+extern void rtc_merge_alarm(struct rtc_time *now, struct rtc_time *alarm);
#include <linux/device.h>
#include <linux/seq_file.h>