diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Documentation/video4linux/CARDLIST.tuner | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 11 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 3 |
4 files changed, 8 insertions, 11 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner index 5d9701f03..e78020f68 100644 --- a/linux/Documentation/video4linux/CARDLIST.tuner +++ b/linux/Documentation/video4linux/CARDLIST.tuner @@ -62,4 +62,3 @@ tuner=60 - Thomson DDT 7611 (ATSC/NTSC) tuner=61 - Tena TNF9533-D/IF tuner=62 - Philips TEA5767HN FM Radio tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner -tuner=64 - Tena TNF9533-B/DF diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 98f49a770..dfb68222a 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.70 2005/06/21 03:30:47 mkrufky Exp $ + * $Id: saa7134-cards.c,v 1.71 2005/06/21 14:58:08 mkrufky Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -1939,7 +1939,7 @@ struct saa7134_board saa7134_boards[] = { */ .name = "Kworld Xpert TV PVR7134", .audio_clock = 0x00187de7, - .tuner_type = TUNER_TENA_9533_B, + .tuner_type = TUNER_TENA_9533_DI, .radio_type = TUNER_TEA5767, .tuner_addr = 0x61, .radio_addr = 0x60, diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index ed989e248..614f7cd6a 100644 --- a/linux/drivers/media/video/tuner-simple.c +++ b/linux/drivers/media/video/tuner-simple.c @@ -1,5 +1,5 @@ /* - * $Id: tuner-simple.c,v 1.29 2005/06/21 11:35:44 mkrufky Exp $ + * $Id: tuner-simple.c,v 1.30 2005/06/21 14:58:08 mkrufky Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -220,16 +220,15 @@ static struct tunertype tuners[] = { 16*160.00,16*454.00,0x01,0x02,0x04,0x8e,732}, { "Thomson DDT 7611 (ATSC/NTSC)", THOMSON, ATSC, 16*157.25,16*454.00,0x39,0x3a,0x3c,0x8e,732}, + /* Should work for TNF9533-D/IF, TNF9533-B/DF */ { "Tena TNF9533-D/IF", Philips, PAL, - 16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623}, + 16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623}, /* This entry is for TEA5767 FM radio only chip used on several boards w/TV tuner */ { TEA5767_TUNER_NAME, Philips, RADIO, - -1, -1, 0, 0, 0, TEA5767_LOW_LO_32768,0}, + -1, -1, 0, 0, 0, TEA5767_LOW_LO_32768,0}, { "Philips FMD1216ME MK3 Hybrid Tuner", Philips, PAL, - 16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 }, - { "Tena TNF9533-B/DF", Philips, PAL, - 16*160.25,16*464.25,0x01,0x02,0x04,0x8e,623}, + 16*160.00,16*442.00,0x51,0x52,0x54,0x86,623 }, }; unsigned const int tuner_count = ARRAY_SIZE(tuners); diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index c43269a0c..4794c5632 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,5 @@ -/* $Id: tuner.h,v 1.32 2005/06/21 03:10:31 mkrufky Exp $ +/* $Id: tuner.h,v 1.33 2005/06/21 14:58:08 mkrufky Exp $ * tuner.h - definition for different tuners @@ -110,7 +110,6 @@ #define TUNER_TEA5767 62 /* Only FM Radio Tuner */ #define TUNER_PHILIPS_FMD1216ME_MK3 63 -#define TUNER_TENA_9533_B 64 #define TEA5767_TUNER_NAME "Philips TEA5767HN FM Radio" |