aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-417.c4
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c
index 9d15d8a353fa..8118091568fc 100644
--- a/drivers/media/video/cx23885/cx23885-417.c
+++ b/drivers/media/video/cx23885/cx23885-417.c
@@ -1731,10 +1731,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
1731 1731
1732static struct video_device cx23885_mpeg_template = { 1732static struct video_device cx23885_mpeg_template = {
1733 .name = "cx23885", 1733 .name = "cx23885",
1734 .type = VID_TYPE_CAPTURE |
1735 VID_TYPE_TUNER |
1736 VID_TYPE_SCALES |
1737 VID_TYPE_MPEG_ENCODER,
1738 .fops = &mpeg_fops, 1734 .fops = &mpeg_fops,
1739 .ioctl_ops = &mpeg_ioctl_ops, 1735 .ioctl_ops = &mpeg_ioctl_ops,
1740 .minor = -1, 1736 .minor = -1,
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 308caa2085ba..ad2235dab5b1 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1472,7 +1472,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
1472static struct video_device cx23885_vbi_template; 1472static struct video_device cx23885_vbi_template;
1473static struct video_device cx23885_video_template = { 1473static struct video_device cx23885_video_template = {
1474 .name = "cx23885-video", 1474 .name = "cx23885-video",
1475 .type = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
1476 .fops = &video_fops, 1475 .fops = &video_fops,
1477 .minor = -1, 1476 .minor = -1,
1478 .ioctl_ops = &video_ioctl_ops, 1477 .ioctl_ops = &video_ioctl_ops,
@@ -1517,7 +1516,6 @@ int cx23885_video_register(struct cx23885_dev *dev)
1517 memcpy(&cx23885_vbi_template, &cx23885_video_template, 1516 memcpy(&cx23885_vbi_template, &cx23885_video_template,
1518 sizeof(cx23885_vbi_template)); 1517 sizeof(cx23885_vbi_template));
1519 strcpy(cx23885_vbi_template.name, "cx23885-vbi"); 1518 strcpy(cx23885_vbi_template.name, "cx23885-vbi");
1520 cx23885_vbi_template.type = VID_TYPE_TELETEXT|VID_TYPE_TUNER;
1521 1519
1522 dev->tvnorm = cx23885_video_template.current_norm; 1520 dev->tvnorm = cx23885_video_template.current_norm;
1523 1521