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-4.16/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
drivers
/
media
/
firewire
/
firedtv-ci.c
diff --git
a/drivers/media/firewire/firedtv-ci.c
b/drivers/media/firewire/firedtv-ci.c
index
edbb30f
..
fb8a1d2
100644
(file)
--- a/
drivers/media/firewire/firedtv-ci.c
+++ b/
drivers/media/firewire/firedtv-ci.c
@@
-207,7
+207,7
@@
static int fdtv_ca_ioctl(struct file *file, unsigned int cmd, void *arg)
return err;
}
-static
unsigned in
t fdtv_ca_io_poll(struct file *file, poll_table *wait)
+static
__poll_
t fdtv_ca_io_poll(struct file *file, poll_table *wait)
{
return POLLIN;
}