diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-04-13 01:54:09 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-04-13 01:54:09 +0200 |
commit | 92f73a62a100d2068e8f327e573da01529184c18 (patch) | |
tree | 48a42be3879d8467c1860d3f14045feb6fccd64e /include | |
parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
parent | 67c1b8c6aa354aad14aad85d36508fd73d1c6361 (diff) | |
download | linux-3.10-92f73a62a100d2068e8f327e573da01529184c18.tar.gz linux-3.10-92f73a62a100d2068e8f327e573da01529184c18.tar.bz2 linux-3.10-92f73a62a100d2068e8f327e573da01529184c18.zip |
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/rtc.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 2ca7e8a7806..877ece45426 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -228,6 +228,8 @@ extern int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alrm); extern int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alrm); +extern int rtc_initialize_alarm(struct rtc_device *rtc, + struct rtc_wkalrm *alrm); extern void rtc_update_irq(struct rtc_device *rtc, unsigned long num, unsigned long events); |