From e3fdb54ccc8758912e4801575379707324da7ff8 Mon Sep 17 00:00:00 2001 From: "Dae S. Kim" Date: Fri, 31 Aug 2012 02:00:51 +0200 Subject: [PATCH] --- yaml --- r: 322687 b: refs/heads/master c: 6bd4a5d96c08dc2380f8053b1bd4f879f55cd3c9 h: refs/heads/master i: 322685: 4347a9355b5659ffcf22fe1fcfa266672e752bfb 322683: 9544901427f07693ce8fbfc1f6e3be5ca79f49ba 322679: e9d80ee1f4cca593a004cfa866171f437b683248 322671: 82af0ecfccc1dfa78b90f75b4d61fef3df2617f7 322655: 0351e48a9782f175529f7495cc3d3f125f46f741 322623: 8b6359d9a96e5769dd0e9bd377be4b04d9ac2b86 322559: 0be7cf4c51f65a11b4128703ab3c0dc429e984e3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/android/android_alarm.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index df487f639d9d..07d2c3d334fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa209eef3ce8419ff2926c2fa944dfbfb5afbacb +refs/heads/master: 6bd4a5d96c08dc2380f8053b1bd4f879f55cd3c9 diff --git a/trunk/drivers/staging/android/android_alarm.h b/trunk/drivers/staging/android/android_alarm.h index d0cafd637199..f2ffd963f1c3 100644 --- a/trunk/drivers/staging/android/android_alarm.h +++ b/trunk/drivers/staging/android/android_alarm.h @@ -51,10 +51,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)