diff --git a/[refs] b/[refs] index 90baaa59922c..8162b2ed71f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e04d6d83a8ddbd6d81f497e583b8d15de3c2995 +refs/heads/master: 29b858471b266be7e56b69cfcee7ba94d9427dd3 diff --git a/trunk/drivers/staging/android/binder.h b/trunk/drivers/staging/android/binder.h index 863ae1ad5d55..25ab6f2759e9 100644 --- a/trunk/drivers/staging/android/binder.h +++ b/trunk/drivers/staging/android/binder.h @@ -84,7 +84,7 @@ struct binder_version { /* This is the current protocol version. */ #define BINDER_CURRENT_PROTOCOL_VERSION 7 -#define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read) +#define BINDER_WRITE_READ _IOWR('b', 1, struct binder_write_read) #define BINDER_SET_IDLE_TIMEOUT _IOW('b', 3, int64_t) #define BINDER_SET_MAX_THREADS _IOW('b', 5, size_t) #define BINDER_SET_IDLE_PRIORITY _IOW('b', 6, int)