diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2012-10-05 23:16:06 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2012-10-05 23:16:06 -0400 |
| commit | b6c8cfdbc5d5dcaea664ffea9c300c6e5d70ab09 (patch) | |
| tree | 14200faac151c696751180742eae30b15385012d /drivers/staging/android/android_alarm.h | |
| parent | 78475c9d785a6d7b3d110e8ebcc9a4d6f1ff473b (diff) | |
| parent | 1c7eb28096b50831697a9cf6f8bf1af0e5b234bc (diff) | |
Merge tag 'v3.4.12' into v3.4-rt
This is the 3.4.12 stable release
Diffstat (limited to 'drivers/staging/android/android_alarm.h')
| -rw-r--r-- | drivers/staging/android/android_alarm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/android/android_alarm.h b/drivers/staging/android/android_alarm.h index 6eecbde2ef6f..66b6e3decc64 100644 --- a/drivers/staging/android/android_alarm.h +++ b/drivers/staging/android/android_alarm.h @@ -110,10 +110,12 @@ enum android_alarm_return_flags { #define ANDROID_ALARM_WAIT _IO('a', 1) #define ALARM_IOW(c, type, size) _IOW('a', (c) | ((type) << 4), size) +#define ALARM_IOR(c, type, size) _IOR('a', (c) | ((type) << 4), size) + /* Set alarm */ #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_GET_TIME(type) ALARM_IOR(4, type, struct timespec) #define ANDROID_ALARM_SET_RTC _IOW('a', 5, struct timespec) #define ANDROID_ALARM_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) #define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) |