aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@kernellabs.com>2009-10-31 12:46:08 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-12-05 15:41:08 -0500
commit53c8ec5e0e93f1ab600f91203ede43b83b3361ba (patch)
treec26257451e9ed20f684cc3e5c7a71eeda860c5e9 /drivers/media/video/saa7134
parent928213aad76e0036290901d244d614c01cac7278 (diff)
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>
Diffstat (limited to 'drivers/media/video/saa7134')
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 9481379edec9..e737ddf94140 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5304,6 +5304,22 @@ struct saa7134_board saa7134_boards[] = {
5304 .amux = LINE2, 5304 .amux = LINE2,
5305 } }, 5305 } },
5306 }, 5306 },
5307 [SAA7134_BOARD_LEADTEK_WINFAST_DTV1000S] = {
5308 .name = "Leadtek Winfast DTV1000S",
5309 .audio_clock = 0x00187de7,
5310 .tuner_type = TUNER_PHILIPS_TDA8290,
5311 .radio_type = UNSET,
5312 .tuner_addr = ADDR_UNSET,
5313 .radio_addr = ADDR_UNSET,
5314 .mpeg = SAA7134_MPEG_DVB,
5315 .inputs = { {
5316 .name = name_comp1,
5317 .vmux = 3,
5318 }, {
5319 .name = name_svideo,
5320 .vmux = 8,
5321 } },
5322 },
5307 5323
5308}; 5324};
5309 5325