V4L/DVB (6225): AverTV Studio 307 has only one composite input

AverTV Studio 307 has only one composite input.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
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 c4dc9868c48b19c6f27e2360102a20a7abc835cf..6b6eae82bcfc163fa2225ea386a449ad134013bf 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -32,6 +32,7 @@ static char name_mute[]    = "mute";
 static char name_radio[]   = "Radio";
 static char name_tv[]      = "Television";
 static char name_tv_mono[] = "TV (mono only)";
+static char name_comp[]    = "Composite";
 static char name_comp1[]   = "Composite1";
 static char name_comp2[]   = "Composite2";
 static char name_comp3[]   = "Composite3";
@@ -1535,12 +1536,7 @@ struct saa7134_board saa7134_boards[] = {
                        .tv   = 1,
                        .gpio = 0x00,
                },{
-                       .name = name_comp1,
-                       .vmux = 0,
-                       .amux = LINE1,
-                       .gpio = 0x02,
-               },{
-                       .name = name_comp2,
+                       .name = name_comp,
                        .vmux = 3,
                        .amux = LINE1,
                        .gpio = 0x02,