diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 02c8dc9f4..dd5c905fe 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-cards.c,v 1.86 2005/08/25 06:06:52 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.87 2005/09/01 21:23:34 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -1374,7 +1374,7 @@ struct saa7134_board saa7134_boards[] = { .inputs = {{ .name = name_comp1, .vmux = 1, - .amux = LINE2, + .amux = LINE1, },{ .name = name_tv, .vmux = 3, @@ -1383,7 +1383,7 @@ struct saa7134_board saa7134_boards[] = { },{ .name = name_svideo, .vmux = 8, - .amux = LINE2, + .amux = LINE1, }}, .radio = { .name = name_radio, diff --git a/v4l/ChangeLog b/v4l/ChangeLog index ea4d8c159..37f647b34 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-09-01 21:17 mkrufky + + * saa7134-cards.c: + - correct the amux for composite and + s-video inputs on the Sabrent SBT-TVFM card. + + Thanks to: Michael Rodriquez-Torrent <mike@themikecam.com> + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-08-30 19:52 mkrufky * saa7134-dvb.c: |