aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:03:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:52 -0400
commit6a989d7328aa4a0b4793ea05b13871bf1b500b1e (patch)
treee9b2c94a34c6e02bef2a88ce44ea294b763b548a /drivers/media
parentfccdf1bd362452d5e2bc0a1874b2b504b481e367 (diff)
[PATCH] v4l: correct the amux for composite and s-video inputs on the Sabrent SBT-TVFM card.
- correct the amux for composite and s-video inputs on the Sabrent SBT-TVFM card. Signed-off-by: Michael Rodriquez-Torrent <mike@themikecam.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 07d3ee0ada7d..acc7a4335e23 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -1372,7 +1372,7 @@ struct saa7134_board saa7134_boards[] = {
1372 .inputs = {{ 1372 .inputs = {{
1373 .name = name_comp1, 1373 .name = name_comp1,
1374 .vmux = 1, 1374 .vmux = 1,
1375 .amux = LINE2, 1375 .amux = LINE1,
1376 },{ 1376 },{
1377 .name = name_tv, 1377 .name = name_tv,
1378 .vmux = 3, 1378 .vmux = 3,
@@ -1381,7 +1381,7 @@ struct saa7134_board saa7134_boards[] = {
1381 },{ 1381 },{
1382 .name = name_svideo, 1382 .name = name_svideo,
1383 .vmux = 8, 1383 .vmux = 8,
1384 .amux = LINE2, 1384 .amux = LINE1,
1385 }}, 1385 }},
1386 .radio = { 1386 .radio = {
1387 .name = name_radio, 1387 .name = name_radio,