Merge tag 'char-misc-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

[linux-2.6-block.git] / drivers / android / binder.c

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 145c062c176dcf87f3a78f0421b72e0be6cfc9d8..d21040c5d343f3fafdd4e97d6bc29bc489aa35db 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4383,7 +4383,7 @@ static int binder_thread_release(struct binder_proc *proc,
        return active_transactions;
 }
 
-static unsigned int binder_poll(struct file *filp,
+static __poll_t binder_poll(struct file *filp,
                                struct poll_table_struct *wait)
 {
        struct binder_proc *proc = filp->private_data;