From: Tim Farrington <timf@iinet.net.au>
Date: Sun, 29 Jun 2008 14:54:08 +0000 (-0300)
Subject: V4L/DVB (8149): Avermedia E506 composite
X-Git-Tag: v2.6.27-rc1~966^2~174
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5e4cd8df61e602202f588dd545364dba37b4cc7;p=linux-2.6

V4L/DVB (8149): Avermedia E506 composite

Composite was originally mis-labelled as name_comp1,
so it should be simply redone as name_comp,
with its now corrected attributes.

Signed-off-by: Tim Farrington <timf@iinet.net.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 348c8635f1..932a93cab3 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/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,