diff options
Diffstat (limited to 'drivers/media/video/zr364xx.c')
-rw-r--r-- | drivers/media/video/zr364xx.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c index 485df2e3613..18d1c4ba79f 100644 --- a/drivers/media/video/zr364xx.c +++ b/drivers/media/video/zr364xx.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/proc_fs.h> | 35 | #include <linux/proc_fs.h> |
36 | #include <linux/highmem.h> | 36 | #include <linux/highmem.h> |
37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
38 | #include <media/v4l2-ioctl.h> | ||
38 | 39 | ||
39 | 40 | ||
40 | /* Version Information */ | 41 | /* Version Information */ |
@@ -761,14 +762,7 @@ static const struct file_operations zr364xx_fops = { | |||
761 | .llseek = no_llseek, | 762 | .llseek = no_llseek, |
762 | }; | 763 | }; |
763 | 764 | ||
764 | static struct video_device zr364xx_template = { | 765 | static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = { |
765 | .owner = THIS_MODULE, | ||
766 | .name = DRIVER_DESC, | ||
767 | .type = VID_TYPE_CAPTURE, | ||
768 | .fops = &zr364xx_fops, | ||
769 | .release = video_device_release, | ||
770 | .minor = -1, | ||
771 | |||
772 | .vidioc_querycap = zr364xx_vidioc_querycap, | 766 | .vidioc_querycap = zr364xx_vidioc_querycap, |
773 | .vidioc_enum_fmt_vid_cap = zr364xx_vidioc_enum_fmt_vid_cap, | 767 | .vidioc_enum_fmt_vid_cap = zr364xx_vidioc_enum_fmt_vid_cap, |
774 | .vidioc_try_fmt_vid_cap = zr364xx_vidioc_try_fmt_vid_cap, | 768 | .vidioc_try_fmt_vid_cap = zr364xx_vidioc_try_fmt_vid_cap, |
@@ -784,6 +778,14 @@ static struct video_device zr364xx_template = { | |||
784 | .vidioc_s_ctrl = zr364xx_vidioc_s_ctrl, | 778 | .vidioc_s_ctrl = zr364xx_vidioc_s_ctrl, |
785 | }; | 779 | }; |
786 | 780 | ||
781 | static struct video_device zr364xx_template = { | ||
782 | .name = DRIVER_DESC, | ||
783 | .fops = &zr364xx_fops, | ||
784 | .ioctl_ops = &zr364xx_ioctl_ops, | ||
785 | .release = video_device_release, | ||
786 | .minor = -1, | ||
787 | }; | ||
788 | |||
787 | 789 | ||
788 | 790 | ||
789 | /*******************/ | 791 | /*******************/ |