summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2005-09-09 22:03:57 +0200
committerLinus Torvalds2005-09-09 22:57:52 +0200
commit6a989d7328aa4a0b4793ea05b13871bf1b500b1e (patch)
treee9b2c94a34c6e02bef2a88ce44ea294b763b548a /drivers
parent[PATCH] v4l: #include <linux/config.h> no longer needed. (diff)
downloadkernel-qcow2-linux-6a989d7328aa4a0b4793ea05b13871bf1b500b1e.tar.gz
kernel-qcow2-linux-6a989d7328aa4a0b4793ea05b13871bf1b500b1e.tar.xz
kernel-qcow2-linux-6a989d7328aa4a0b4793ea05b13871bf1b500b1e.zip
[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')
-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[] = {
.inputs = {{
.name = name_comp1,
.vmux = 1,
- .amux = LINE2,
+ .amux = LINE1,
},{
.name = name_tv,
.vmux = 3,
@@ -1381,7 +1381,7 @@ struct saa7134_board saa7134_boards[] = {
},{
.name = name_svideo,
.vmux = 8,
- .amux = LINE2,
+ .amux = LINE1,
}},
.radio = {
.name = name_radio,