From ea76800c904c20b22c55de804c23ad8a2936d37d Mon Sep 17 00:00:00 2001
From: Tim Farrington <timf@iinet.net.au>
Date: Sun, 29 Jun 2008 11:54:08 -0300
Subject: [PATCH] --- yaml --- r: 103887 b: refs/heads/master c:
 e5e4cd8df61e602202f588dd545364dba37b4cc7 h: refs/heads/master i:   103885:
 1a16774b4bc5c043daabf301a9b938a0714d3c86   103883:
 5f0719802e73ff0e4a4210729e24273b6024eded   103879:
 f8d189beb9c6ed3d799828d1e2f0415bf6835c0b   103871:
 4421a8becd1b74336485be588a9bc84c579abcce v: v3

---
 [refs]                                            |  2 +-
 trunk/drivers/media/video/saa7134/saa7134-cards.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 1b11d5941ccb..e62f40fd37ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5376adacc693155c24e4e7be3777bdd0eeb99f7
+refs/heads/master: e5e4cd8df61e602202f588dd545364dba37b4cc7
diff --git a/trunk/drivers/media/video/saa7134/saa7134-cards.c b/trunk/drivers/media/video/saa7134/saa7134-cards.c
index 348c8635f19f..932a93cab3ef 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-cards.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-cards.c
@@ -4200,17 +4200,13 @@ struct saa7134_board saa7134_boards[] = {
 			 .amux = TV,
 			 .tv   = 1,
 		 }, {
-			 .name = name_comp1,
-			 .vmux = 3,
-			 .amux = LINE2,
+			 .name = name_comp,
+			 .vmux = 0,
+			 .amux = LINE1,
 		 }, {
 			 .name = name_svideo,
 			 .vmux = 8,
 			 .amux = LINE1,
-		}, {
-			.name = name_comp,
-			.vmux = 0,
-			.amux = LINE1,
 		 } },
 		 .radio = {
 			 .name = name_radio,