projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'drm/panel/for-3.17-rc1' of git://anongit.freedesktop.org/tegra/linux into...
[cascardo/linux.git]
/
drivers
/
media
/
pci
/
saa7134
/
saa7134-empress.c
diff --git
a/drivers/media/pci/saa7134/saa7134-empress.c
b/drivers/media/pci/saa7134/saa7134-empress.c
index
e65c760
..
0006d6b
100644
(file)
--- a/
drivers/media/pci/saa7134/saa7134-empress.c
+++ b/
drivers/media/pci/saa7134/saa7134-empress.c
@@
-179,7
+179,7
@@
static const struct v4l2_file_operations ts_fops =
.read = vb2_fop_read,
.poll = vb2_fop_poll,
.mmap = vb2_fop_mmap,
- .
ioctl
= video_ioctl2,
+ .
unlocked_ioctl
= video_ioctl2,
};
static const struct v4l2_ioctl_ops ts_ioctl_ops = {