diff options
author | Tony Lindgren <tony@atomide.com> | 2010-12-21 16:53:00 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-12-21 16:53:00 -0800 |
commit | bb3613aa34a81a5e2f1227ccdb801fde04a7da10 (patch) | |
tree | bb79c15d5da41113bd7b83d9e74fbfc4a1bf8569 /drivers/media/video/c-qcam.c | |
parent | 6971071cdda79cad5f53ba390e466d696e7e9006 (diff) | |
parent | bb1c9034b3ce7f29d3d178a87b42b767611d6574 (diff) |
Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'drivers/media/video/c-qcam.c')
-rw-r--r-- | drivers/media/video/c-qcam.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index 6e4b19698c1..24fc00965a1 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c @@ -718,7 +718,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, }; |