aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-04-22 15:15:11 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:58:19 -0400
commitd9e12f25cf538d103426946121d214dff332efbb (patch)
tree62767d340fc1716fddc993df602c62238d76ddd8
parent0b5f56d67821587495eb47014750e2ae7373d635 (diff)
V4L/DVB (3830): Fix display name for LG TDVS-H06xF
This patch fixes the display name for LG TDVS-H06xF tuners in both tuner and dvb-pll modules. Changing the names of the actual pll_desc struct and tuner definitions has been held back until after the dvb tuner refactoring gets merged. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--Documentation/video4linux/CARDLIST.tuner2
-rw-r--r--drivers/media/dvb/frontends/dvb-pll.c4
-rw-r--r--drivers/media/video/tuner-types.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/video4linux/CARDLIST.tuner b/Documentation/video4linux/CARDLIST.tuner
index 46ae7775ba03..44134f04b82a 100644
--- a/Documentation/video4linux/CARDLIST.tuner
+++ b/Documentation/video4linux/CARDLIST.tuner
@@ -62,7 +62,7 @@ tuner=60 - Thomson DTT 761X (ATSC/NTSC)
62tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF 62tuner=61 - Tena TNF9533-D/IF/TNF9533-B/DF
63tuner=62 - Philips TEA5767HN FM Radio 63tuner=62 - Philips TEA5767HN FM Radio
64tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner 64tuner=63 - Philips FMD1216ME MK3 Hybrid Tuner
65tuner=64 - LG TDVS-H062F/TUA6034 65tuner=64 - LG TDVS-H06xF
66tuner=65 - Ymec TVF66T5-B/DFF 66tuner=65 - Ymec TVF66T5-B/DFF
67tuner=66 - LG TALN series 67tuner=66 - LG TALN series
68tuner=67 - Philips TD1316 Hybrid Tuner 68tuner=67 - Philips TD1316 Hybrid Tuner
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 791706ec1da3..50a79eea892a 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -227,10 +227,10 @@ struct dvb_pll_desc dvb_pll_tua6034 = {
227EXPORT_SYMBOL(dvb_pll_tua6034); 227EXPORT_SYMBOL(dvb_pll_tua6034);
228 228
229/* Infineon TUA6034 229/* Infineon TUA6034
230 * used in LG TDVS H061F and LG TDVS H062F 230 * used in LG TDVS-H061F, LG TDVS-H062F and LG TDVS-H064F
231 */ 231 */
232struct dvb_pll_desc dvb_pll_tdvs_tua6034 = { 232struct dvb_pll_desc dvb_pll_tdvs_tua6034 = {
233 .name = "LG/Infineon TUA6034", 233 .name = "LG TDVS-H06xF",
234 .min = 54000000, 234 .min = 54000000,
235 .max = 863000000, 235 .max = 863000000,
236 .count = 3, 236 .count = 3,
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index 79410566030f..4b77d21067da 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -1371,7 +1371,7 @@ struct tunertype tuners[] = {
1371 .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params), 1371 .count = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params),
1372 }, 1372 },
1373 [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */ 1373 [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */
1374 .name = "LG TDVS-H062F/TUA6034", 1374 .name = "LG TDVS-H06xF", /* H061F, H062F & H064F */
1375 .params = tuner_tua6034_params, 1375 .params = tuner_tua6034_params,
1376 .count = ARRAY_SIZE(tuner_tua6034_params), 1376 .count = ARRAY_SIZE(tuner_tua6034_params),
1377 }, 1377 },