diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-01-10 14:48:02 -0500 |
| commit | 68c404b18f6fba404b2753622d0459c68ee128ae (patch) | |
| tree | c1ec0bb12f19d91071b461cc2831d9d3dd4c74f3 /drivers/media/video/c-qcam.c | |
| parent | d035c36c58dd9183ad6aa7875dea89893faedb55 (diff) | |
| parent | 6650239a4b01077e80d5a4468562756d77afaa59 (diff) | |
Merge branch 'bugfixes' into nfs-for-2.6.38
Conflicts:
fs/nfs/nfs2xdr.c
fs/nfs/nfs3xdr.c
fs/nfs/nfs4xdr.c
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 6e4b19698c13..24fc00965a12 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, | |||
| 718 | 718 | ||
| 719 | static const struct v4l2_file_operations qcam_fops = { | 719 | static const struct v4l2_file_operations qcam_fops = { |
| 720 | .owner = THIS_MODULE, | 720 | .owner = THIS_MODULE, |
| 721 | .ioctl = video_ioctl2, | 721 | .unlocked_ioctl = video_ioctl2, |
| 722 | .read = qcam_read, | 722 | .read = qcam_read, |
| 723 | }; | 723 | }; |
| 724 | 724 | ||