Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / drivers / android / binder.c

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index a7ecfde66b7b34f44cc9cffeac0be1b703e29aff..cc89d0d2b9654a2e44b61b38e1b44cbfb7da8a97 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4311,7 +4311,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;