aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vivi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-12-13 04:35:26 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:03:33 -0500
commit784c668b24dede8acd7044b490a538b5b6cd6b20 (patch)
tree6d460acd0442820a99b55e18b34fdb324c221e84 /drivers/media/video/vivi.c
parent63736784f73e7c38b2bad5ed3ed783dc102ba01e (diff)
V4L/DVB (6806): Allow emulating changes of video std by vivi
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r--drivers/media/video/vivi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index 2bbefd926256..0b5c1426bb90 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -919,7 +919,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
919 return -EINVAL; 919 return -EINVAL;
920 920
921 inp->type = V4L2_INPUT_TYPE_CAMERA; 921 inp->type = V4L2_INPUT_TYPE_CAMERA;
922 inp->std = V4L2_STD_NTSC_M; 922 inp->std = V4L2_STD_525_60;
923 strcpy(inp->name, "Camera"); 923 strcpy(inp->name, "Camera");
924 924
925 return (0); 925 return (0);
@@ -1172,7 +1172,7 @@ static struct video_device vivi_template = {
1172#ifdef CONFIG_VIDEO_V4L1_COMPAT 1172#ifdef CONFIG_VIDEO_V4L1_COMPAT
1173 .vidiocgmbuf = vidiocgmbuf, 1173 .vidiocgmbuf = vidiocgmbuf,
1174#endif 1174#endif
1175 .tvnorms = V4L2_STD_NTSC_M, 1175 .tvnorms = V4L2_STD_525_60,
1176 .current_norm = V4L2_STD_NTSC_M, 1176 .current_norm = V4L2_STD_NTSC_M,
1177}; 1177};
1178/* ----------------------------------------------------------------- 1178/* -----------------------------------------------------------------