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/android_alarm.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/android_alarm.h')
-rw-r--r-- | include/linux/android_alarm.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/android_alarm.h b/include/linux/android_alarm.h index 68c9b0f..4c93791 100644 --- a/include/linux/android_alarm.h +++ b/include/linux/android_alarm.h @@ -76,6 +76,8 @@ ktime_t alarm_get_elapsed_realtime(void); int alarm_set_rtc(const struct timespec ts); #if defined(CONFIG_RTC_ALARM_BOOT) int alarm_set_alarm_boot(char *alarm_data); +#elif defined(CONFIG_RTC_POWER_OFF) +int alarm_set_alarm_poweroff(char *alarm_data); #endif #endif @@ -102,9 +104,11 @@ enum android_alarm_return_flags { #define ANDROID_ALARM_SET(type) ALARM_IOW(2, type, struct timespec) #define ANDROID_ALARM_SET_AND_WAIT(type) ALARM_IOW(3, type, struct timespec) #define ANDROID_ALARM_GET_TIME(type) ALARM_IOW(4, type, struct timespec) -#define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec) +#define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec) #if defined(CONFIG_RTC_ALARM_BOOT) -#define ANDROID_ALARM_SET_ALARM_BOOT _IOW('a', 7, struct timespec) +#define ANDROID_ALARM_SET_ALARM_BOOT _IOW('a', 7, struct timespec) +#elif defined(CONFIG_RTC_POWER_OFF) +#define ANDROID_ALARM_SET_ALARM_POWEROFF _IOW('a', 8, struct timespec) #endif #define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) #define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) |