aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/tuner-simple.c2
-rw-r--r--include/media/tuner.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index cf241ab1e1b0..d579e35a1077 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -512,7 +512,7 @@ static struct tunertype tuners[] = {
512 .UHF = 0x30, 512 .UHF = 0x30,
513 .config = 0x8e, 513 .config = 0x8e,
514 }, 514 },
515 [TUNER_MICROTUNE_4042_FI5] = { /* Panasonic NTSC */ 515 [TUNER_PANASONIC_VP27] = { /* Panasonic NTSC */
516 .name = "Panasonic VP27s/ENGE4324D", 516 .name = "Panasonic VP27s/ENGE4324D",
517 .thresh1= 16 * 160.00 /*MHz*/, 517 .thresh1= 16 * 160.00 /*MHz*/,
518 .thresh2= 16 * 454.00 /*MHz*/, 518 .thresh2= 16 * 454.00 /*MHz*/,
diff --git a/include/media/tuner.h b/include/media/tuner.h
index b28aa17213f5..e224722a7ff7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -82,9 +82,9 @@
82#define TUNER_PHILIPS_FM1236_MK3 43 82#define TUNER_PHILIPS_FM1236_MK3 43
83 83
84#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ 84#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */
85/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */ 85/* Microtune merged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
86#define TUNER_MICROTUNE_4049FM5 45 86#define TUNER_MICROTUNE_4049FM5 45
87#define TUNER_MICROTUNE_4042_FI5 46 87#define TUNER_PANASONIC_VP27 46
88#define TUNER_LG_NTSC_TAPE 47 88#define TUNER_LG_NTSC_TAPE 47
89 89
90#define TUNER_TNF_8831BGFF 48 90#define TUNER_TNF_8831BGFF 48