---

yaml --- r: 76576 b: refs/heads/master c: 784c668 h: refs/heads/master v: v3
git-mirror · Jan 25, 2008 · 2729614 · 2729614
1 parent 7aca00f
commit 2729614
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63736784f73e7c38b2bad5ed3ed783dc102ba01e
+refs/heads/master: 784c668b24dede8acd7044b490a538b5b6cd6b20
diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c
@@ -919,7 +919,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
 		return -EINVAL;
 
 	inp->type = V4L2_INPUT_TYPE_CAMERA;
-	inp->std = V4L2_STD_NTSC_M;
+	inp->std = V4L2_STD_525_60;
 	strcpy(inp->name, "Camera");
 
 	return (0);
@@ -1172,7 +1172,7 @@ static struct video_device vivi_template = {
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 	.vidiocgmbuf          = vidiocgmbuf,
 #endif
-	.tvnorms              = V4L2_STD_NTSC_M,
+	.tvnorms              = V4L2_STD_525_60,
 	.current_norm         = V4L2_STD_NTSC_M,
 };
 /* -----------------------------------------------------------------