Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / include / linux / poll.h

diff --git a/include/linux/poll.h b/include/linux/poll.h
index 75ffc5729e4c654bdccd142df3d3fbac0018d6e4..2889f09a1c6080523ebf7179d337868d4610763b 100644 (file)
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -75,7 +75,7 @@ static inline void init_poll_funcptr(poll_table *pt, poll_queue_proc qproc)
 struct poll_table_entry {
        struct file *filp;
        unsigned long key;
-       wait_queue_t wait;
+       wait_queue_entry_t wait;
        wait_queue_head_t *wait_address;
 };