Commit 6a989d73 authored Sep 09, 2005 by Mauro Carvalho Chehab Committed by Linus Torvalds Sep 09, 2005

[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>

parent fccdf1bd

drivers/media/video/saa7134/saa7134-cards.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,