Merge tag 'for-linus-4.16-1' of git://github.com/cminyard/linux-ipmi

[muen/linux.git] / drivers / char / ipmi / ipmi_watchdog.c

diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 775887977cbcf70536ee0beeb01fe2dc7c99b39b..34bc1f3ca41436279e9694c5d9a32d913b0f80f7 100644 (file)
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -887,9 +887,9 @@ static int ipmi_open(struct inode *ino, struct file *filep)
        }
 }
 
-static unsigned int ipmi_poll(struct file *file, poll_table *wait)
+static __poll_t ipmi_poll(struct file *file, poll_table *wait)
 {
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        poll_wait(file, &read_q, wait);