diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-05-08 03:34:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:18 -0400 |
| commit | 416ce32e704d778c283f2f86cadd836cd5d3696c (patch) | |
| tree | ede7fe08271e40367d228ef4b7a79eba68030ad4 /include/linux/rtc.h | |
| parent | 19bfe37caa8184768ecc15269302f42036625259 (diff) | |
revert "rtc: Add rtc_merge_alarm()"
David says "884b4aaaa242a2db8c8252796f0118164a680ab5 should be reverted. It
added an rtc_merge_alarm() call to the 2.6.20 kernel, which hasn't yet been
used by any in-tree driver; this patch obviates the need for that call, and
uses a more robust approach."
Cc: Scott Wood <scottwood@freescale.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/rtc.h')
| -rw-r--r-- | include/linux/rtc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 07ecd4ca8ca7..6d5e4a46781e 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
| @@ -106,7 +106,6 @@ 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); | ||
| 110 | 109 | ||
| 111 | #include <linux/device.h> | 110 | #include <linux/device.h> |
| 112 | #include <linux/seq_file.h> | 111 | #include <linux/seq_file.h> |