diff options
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 059b01c11dc..3518af071a2 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
36 | #include <media/videobuf-vmalloc.h> | 36 | #include <media/videobuf-vmalloc.h> |
37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
38 | #include <media/v4l2-ioctl.h> | ||
38 | #include <linux/kthread.h> | 39 | #include <linux/kthread.h> |
39 | #include <linux/highmem.h> | 40 | #include <linux/highmem.h> |
40 | #include <linux/freezer.h> | 41 | #include <linux/freezer.h> |
@@ -1065,13 +1066,7 @@ static const struct file_operations vivi_fops = { | |||
1065 | .llseek = no_llseek, | 1066 | .llseek = no_llseek, |
1066 | }; | 1067 | }; |
1067 | 1068 | ||
1068 | static struct video_device vivi_template = { | 1069 | static const struct v4l2_ioctl_ops vivi_ioctl_ops = { |
1069 | .name = "vivi", | ||
1070 | .type = VID_TYPE_CAPTURE, | ||
1071 | .fops = &vivi_fops, | ||
1072 | .minor = -1, | ||
1073 | .release = video_device_release, | ||
1074 | |||
1075 | .vidioc_querycap = vidioc_querycap, | 1070 | .vidioc_querycap = vidioc_querycap, |
1076 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, | 1071 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1077 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, | 1072 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
@@ -1093,6 +1088,15 @@ static struct video_device vivi_template = { | |||
1093 | #ifdef CONFIG_VIDEO_V4L1_COMPAT | 1088 | #ifdef CONFIG_VIDEO_V4L1_COMPAT |
1094 | .vidiocgmbuf = vidiocgmbuf, | 1089 | .vidiocgmbuf = vidiocgmbuf, |
1095 | #endif | 1090 | #endif |
1091 | }; | ||
1092 | |||
1093 | static struct video_device vivi_template = { | ||
1094 | .name = "vivi", | ||
1095 | .fops = &vivi_fops, | ||
1096 | .ioctl_ops = &vivi_ioctl_ops, | ||
1097 | .minor = -1, | ||
1098 | .release = video_device_release, | ||
1099 | |||
1096 | .tvnorms = V4L2_STD_525_60, | 1100 | .tvnorms = V4L2_STD_525_60, |
1097 | .current_norm = V4L2_STD_NTSC_M, | 1101 | .current_norm = V4L2_STD_NTSC_M, |
1098 | }; | 1102 | }; |