diff options
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-video.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 245712e45f69..308caa2085ba 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
@@ -1434,12 +1434,7 @@ static const struct file_operations video_fops = { | |||
1434 | .llseek = no_llseek, | 1434 | .llseek = no_llseek, |
1435 | }; | 1435 | }; |
1436 | 1436 | ||
1437 | static struct video_device cx23885_vbi_template; | 1437 | static const struct v4l2_ioctl_ops video_ioctl_ops = { |
1438 | static struct video_device cx23885_video_template = { | ||
1439 | .name = "cx23885-video", | ||
1440 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES, | ||
1441 | .fops = &video_fops, | ||
1442 | .minor = -1, | ||
1443 | .vidioc_querycap = vidioc_querycap, | 1438 | .vidioc_querycap = vidioc_querycap, |
1444 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, | 1439 | .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, |
1445 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, | 1440 | .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, |
@@ -1472,6 +1467,15 @@ static struct video_device cx23885_video_template = { | |||
1472 | .vidioc_g_register = vidioc_g_register, | 1467 | .vidioc_g_register = vidioc_g_register, |
1473 | .vidioc_s_register = vidioc_s_register, | 1468 | .vidioc_s_register = vidioc_s_register, |
1474 | #endif | 1469 | #endif |
1470 | }; | ||
1471 | |||
1472 | static struct video_device cx23885_vbi_template; | ||
1473 | static struct video_device cx23885_video_template = { | ||
1474 | .name = "cx23885-video", | ||
1475 | .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES, | ||
1476 | .fops = &video_fops, | ||
1477 | .minor = -1, | ||
1478 | .ioctl_ops = &video_ioctl_ops, | ||
1475 | .tvnorms = CX23885_NORMS, | 1479 | .tvnorms = CX23885_NORMS, |
1476 | .current_norm = V4L2_STD_NTSC_M, | 1480 | .current_norm = V4L2_STD_NTSC_M, |
1477 | }; | 1481 | }; |