HID: wacom: wacom_wac_collection() is local to wacom_wac.c

[linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 6f05d5c4bf30759ea69944bd212891b9ce49469e..2f378449bc1bf96a9425225ba2a3f8dd1975ca3d 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -118,7 +118,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from);
 static int sock_mmap(struct file *file, struct vm_area_struct *vma);
 
 static int sock_close(struct inode *inode, struct file *file);
-static unsigned int sock_poll(struct file *file,
+static __poll_t sock_poll(struct file *file,
                              struct poll_table_struct *wait);
 static long sock_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
 #ifdef CONFIG_COMPAT
@@ -1097,9 +1097,9 @@ int sock_create_lite(int family, int type, int protocol, struct socket **res)
 EXPORT_SYMBOL(sock_create_lite);
 
 /* No kernel lock held - perfect */
-static unsigned int sock_poll(struct file *file, poll_table *wait)
+static __poll_t sock_poll(struct file *file, poll_table *wait)
 {
-       unsigned int busy_flag = 0;
+       __poll_t busy_flag = 0;
        struct socket *sock;
 
        /*