diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /include/linux/rtc.h | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'include/linux/rtc.h')
| -rw-r--r-- | include/linux/rtc.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index ceeb53c..8394141 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -150,6 +150,8 @@ struct rtc_class_ops { int (*set_alarm)(struct device *, struct rtc_wkalrm *); #if defined(CONFIG_RTC_ALARM_BOOT) int (*set_alarm_boot)(struct device *, struct rtc_wkalrm *); +#elif defined(CONFIG_RTC_POWER_OFF) + int (*set_alarm_poweroff)(struct device *, struct rtc_wkalrm *); #endif int (*proc)(struct device *, struct seq_file *); int (*set_mmss)(struct device *, unsigned long secs); @@ -236,10 +238,13 @@ extern int rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alrm); #if defined(CONFIG_RTC_ALARM_BOOT) extern int rtc_set_alarm_boot(struct rtc_device *rtc, - struct rtc_wkalrm *alarm); + struct rtc_wkalrm *alarm); +#elif defined(CONFIG_RTC_POWER_OFF) +extern int rtc_set_alarm_poweroff(struct rtc_device *rtc, + struct rtc_wkalrm *alarm); #endif extern int rtc_initialize_alarm(struct rtc_device *rtc, - struct rtc_wkalrm *alrm); + struct rtc_wkalrm *alrm); extern void rtc_update_irq(struct rtc_device *rtc, unsigned long num, unsigned long events); |