diff options
| author | Roman Shaposhnikov <x0166637@ti.com> | 2013-02-01 11:16:04 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@git.omapzoom.org> | 2013-02-01 11:16:04 -0600 |
| commit | 5a047beed316f1bcc2b1e0185166dba8faa72000 (patch) | |
| tree | a5a9d37c60cd5806894c65f0eeb99edcf956e95c | |
| parent | 50ce3a751f98760bde3128760fa981fa8de2960c (diff) | |
| parent | 075170b57403b1ce8db48250d921352898913a8f (diff) | |
| download | omap-omapzoom-p-android-omap-3.0-dev.tar.gz | |
Merge "Revert "Android alarm: IOCTL command encoding fix"" into p-android-omap-3.0-devp-android-omap-3.0-dev
| -rw-r--r-- | include/linux/android_alarm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/android_alarm.h b/include/linux/android_alarm.h index c09d9bcbeece..f8f14e793dbf 100644 --- a/include/linux/android_alarm.h +++ b/include/linux/android_alarm.h @@ -95,12 +95,10 @@ 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_IOR(4, 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_BASE_CMD(cmd) (cmd & ~(_IOC(0, 0, 0xf0, 0))) #define ANDROID_ALARM_IOCTL_TO_TYPE(cmd) (_IOC_NR(cmd) >> 4) |