The patch titled
AverTV Studio 307 has only one composite input
has been removed from the -mm tree. Its filename was
avertv-studio-307-has-only-one-composite-input.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: AverTV Studio 307 has only one composite input
From: Stas Sergeev <stsp@xxxxxxxx>
AverTV Studio 307 has only one composite input.
Signed-off-by: Stas Sergeev <stsp@xxxxxxxx>
Acked-by: Nickolay V. Shmyrev <nshmyrev@xxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/media/video/saa7134/saa7134-cards.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN drivers/media/video/saa7134/saa7134-cards.c~avertv-studio-307-has-only-one-composite-input drivers/media/video/saa7134/saa7134-cards.c
--- a/drivers/media/video/saa7134/saa7134-cards.c~avertv-studio-307-has-only-one-composite-input
+++ a/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,
_
Patches currently in -mm which might be from stsp@xxxxxxxx are
git-dvb.patch
fix-mux-setup-for-composite-sound-on-avertv-307.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
