summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Sergeev <stsp@aknet.ru>2007-09-17 15:34:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 22:14:45 -0300
commitf438d97447d4ccd241db8477f62a0647b9e8220e (patch)
tree346def86c7f2654408178a3336b909842042f7e5
parent0e789d7ffafbfd44f7fb2bdbf1138547d8abc231 (diff)
downloadop-kernel-dev-f438d97447d4ccd241db8477f62a0647b9e8220e.zip
op-kernel-dev-f438d97447d4ccd241db8477f62a0647b9e8220e.tar.gz
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>
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index c4dc986..6b6eae8 100644
--- 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,
OpenPOWER on IntegriCloud