diff options
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
-rw-r--r-- | drivers/media/video/stk-webcam.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index f9516d0f3c11..26378cf390fc 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
@@ -664,7 +664,7 @@ static void stk_free_buffers(struct stk_camera *dev) | |||
664 | 664 | ||
665 | /* v4l file operations */ | 665 | /* v4l file operations */ |
666 | 666 | ||
667 | static int v4l_stk_open(struct inode *inode, struct file *fp) | 667 | static int v4l_stk_open(struct file *fp) |
668 | { | 668 | { |
669 | struct stk_camera *dev; | 669 | struct stk_camera *dev; |
670 | struct video_device *vdev; | 670 | struct video_device *vdev; |
@@ -684,7 +684,7 @@ static int v4l_stk_open(struct inode *inode, struct file *fp) | |||
684 | return 0; | 684 | return 0; |
685 | } | 685 | } |
686 | 686 | ||
687 | static int v4l_stk_release(struct inode *inode, struct file *fp) | 687 | static int v4l_stk_release(struct file *fp) |
688 | { | 688 | { |
689 | struct stk_camera *dev = fp->private_data; | 689 | struct stk_camera *dev = fp->private_data; |
690 | 690 | ||
@@ -1281,7 +1281,7 @@ static int stk_vidioc_enum_framesizes(struct file *filp, | |||
1281 | } | 1281 | } |
1282 | } | 1282 | } |
1283 | 1283 | ||
1284 | static struct file_operations v4l_stk_fops = { | 1284 | static struct v4l2_file_operations v4l_stk_fops = { |
1285 | .owner = THIS_MODULE, | 1285 | .owner = THIS_MODULE, |
1286 | .open = v4l_stk_open, | 1286 | .open = v4l_stk_open, |
1287 | .release = v4l_stk_release, | 1287 | .release = v4l_stk_release, |
@@ -1289,10 +1289,6 @@ static struct file_operations v4l_stk_fops = { | |||
1289 | .poll = v4l_stk_poll, | 1289 | .poll = v4l_stk_poll, |
1290 | .mmap = v4l_stk_mmap, | 1290 | .mmap = v4l_stk_mmap, |
1291 | .ioctl = video_ioctl2, | 1291 | .ioctl = video_ioctl2, |
1292 | #ifdef CONFIG_COMPAT | ||
1293 | .compat_ioctl = v4l_compat_ioctl32, | ||
1294 | #endif | ||
1295 | .llseek = no_llseek | ||
1296 | }; | 1292 | }; |
1297 | 1293 | ||
1298 | static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = { | 1294 | static const struct v4l2_ioctl_ops v4l_stk_ioctl_ops = { |