Commit 53c8ec5e authored Oct 31, 2009 by Michael Krufky Committed by Mauro Carvalho Chehab Dec 05, 2009

V4L/DVB (13259): saa7134: fix badly merged DTV1000S patch



As pointed out by Hermann Pitton, it turns out that the DTV1000S card's
analog entry made it into the #if 0 flyvideo tweaks in saa7134-cards.c
and is not valid there.

This patch fixes the problem.

Cc: hermann pitton <hermann-pitton@arcor.de>
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 928213aa

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -5304,6 +5304,22 @@ struct saa7134_board saa7134_boards[] = {
		.amux = LINE2,
		} },
		},
		[SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S] = {
		.name = "Leadtek Winfast DTV1000S",
		.audio_clock = 0x00187de7,
		.tuner_type = TUNER_PHILIPS_TDA8290,
		.radio_type = UNSET,
		.tuner_addr = ADDR_UNSET,
		.radio_addr = ADDR_UNSET,
		.mpeg = SAA7134_MPEG_DVB,
		.inputs = { {
		.name = name_comp1,
		.vmux = 3,
		}, {
		.name = name_svideo,
		.vmux = 8,
		} },
		},

		};