Merge master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

[linux-2.6-omap-h63xx.git] / include / linux / rtc.h

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 07ecd4ca8ca73cc3d3911e9176e5bfdfaa78edbb..6d5e4a46781ef1ca6dff692b6685e2e645c42153 100644 (file)
--- 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
 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>