From b3d2723b1b6edff0d2d1ce8f497dd5869d765fe7 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sun, 22 Jul 2007 09:42:09 -0300
Subject: [PATCH] --- yaml --- r: 65676 b: refs/heads/master c:
 7bb293849489b6cc5d6919b8c7f94cb273303e1f h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/ivtv/ivtv-streams.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 0fe346112806..e99d14570fe4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54d75ebaa02809f24a16624e32706af3bf97588e
+refs/heads/master: 7bb293849489b6cc5d6919b8c7f94cb273303e1f
diff --git a/trunk/drivers/media/video/ivtv/ivtv-streams.c b/trunk/drivers/media/video/ivtv/ivtv-streams.c
index 51df3f855031..405e2e3fcb49 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-streams.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-streams.c
@@ -314,15 +314,6 @@ static void ivtv_vbi_setup(struct ivtv *itv)
 	int lines;
 	int i;
 
-	/* If Embed then streamtype must be Program */
-	/* TODO: should we really do this? */
-	if (0 && !raw && itv->vbi.insert_mpeg) {
-		itv->params.stream_type = 0;
-
-		/* assign stream type */
-		ivtv_vapi(itv, CX2341X_ENC_SET_STREAM_TYPE, 1, itv->params.stream_type);
-	}
-
 	/* Reset VBI */
 	ivtv_vapi(itv, CX2341X_ENC_SET_VBI_LINE, 5, 0xffff , 0, 0, 0, 0);