diff options
Diffstat (limited to 'net/atm/common.c')
| -rw-r--r-- | net/atm/common.c | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/net/atm/common.c b/net/atm/common.c index 8a4f99114cd2..6523f38c4957 100644 --- a/net/atm/common.c +++ b/net/atm/common.c @@ -14,7 +14,7 @@  #include <linux/capability.h>  #include <linux/mm.h>  #include <linux/sched/signal.h> -#include <linux/time.h>		/* struct timeval */ +#include <linux/time64.h>	/* 64-bit time for seconds */  #include <linux/skbuff.h>  #include <linux/bitops.h>  #include <linux/init.h> @@ -648,11 +648,11 @@ out:  	return error;  } -unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait) +__poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)  {  	struct sock *sk = sock->sk;  	struct atm_vcc *vcc; -	unsigned int mask; +	__poll_t mask;  	sock_poll_wait(file, sk_sleep(sk), wait);  	mask = 0;  |