diff options
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 4 |
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 | /* ----------------------------------------------------------------- |