projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus-4.16-1' of git://github.com/cminyard/linux-ipmi
[linux-2.6-microblaze.git]
/
drivers
/
char
/
ipmi
/
ipmi_watchdog.c
diff --git
a/drivers/char/ipmi/ipmi_watchdog.c
b/drivers/char/ipmi/ipmi_watchdog.c
index
7758879
..
34bc1f3
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 in
t ipmi_poll(struct file *file, poll_table *wait)
+static
__poll_
t ipmi_poll(struct file *file, poll_table *wait)
{
-
unsigned in
t mask = 0;
+
__poll_
t mask = 0;
poll_wait(file, &read_q, wait);