projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
media
/
video
/
bw-qcam.c
diff --git
a/drivers/media/video/bw-qcam.c
b/drivers/media/video/bw-qcam.c
index
935e0c9
..
c119350
100644
(file)
--- a/
drivers/media/video/bw-qcam.c
+++ b/
drivers/media/video/bw-qcam.c
@@
-860,7
+860,7
@@
static ssize_t qcam_read(struct file *file, char __user *buf,
static const struct v4l2_file_operations qcam_fops = {
.owner = THIS_MODULE,
- .
ioctl
= video_ioctl2,
+ .
unlocked_ioctl
= video_ioctl2,
.read = qcam_read,
};