summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2006-01-09 18:25:10 +0100
committerMauro Carvalho Chehab <mchehab@brturbo.com.br>2006-01-09 18:25:10 +0100
commit174329d951e2fe39f779d67e9488b7a7f15df69c (patch)
treebca52d63720bfb19346f4c7656bc939d65ccd5e6
parentDVB (2390): Adds a time-delay to IR remote button presses for av7110 ir input, (diff)
downloadlinux-174329d951e2fe39f779d67e9488b7a7f15df69c.tar.xz
linux-174329d951e2fe39f779d67e9488b7a7f15df69c.zip
V4L/DVB (3062): Fix wrong tuner.h define for tuner 46
- Fix wrong tuner.h define for tuner 46 (it's a Panasonic, not a Microtune). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-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[] = {
.UHF = 0x30,
.config = 0x8e,
},
- [TUNER_MICROTUNE_4042_FI5] = { /* Panasonic NTSC */
+ [TUNER_PANASONIC_VP27] = { /* Panasonic NTSC */
.name = "Panasonic VP27s/ENGE4324D",
.thresh1= 16 * 160.00 /*MHz*/,
.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 @@
#define TUNER_PHILIPS_FM1236_MK3 43
#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */
-/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
+/* Microtune merged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */
#define TUNER_MICROTUNE_4049FM5 45
-#define TUNER_MICROTUNE_4042_FI5 46
+#define TUNER_PANASONIC_VP27 46
#define TUNER_LG_NTSC_TAPE 47
#define TUNER_TNF_8831BGFF 48