diff options
| -rw-r--r-- | linux/drivers/media/video/tuner-simple.c | 4 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c index ae20ea0c8..51628cccd 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.59 2005/11/25 13:46:01 mchehab Exp $ + * $Id: tuner-simple.c,v 1.60 2005/11/27 00:06:28 hverkuil Exp $ * * i2c tv tuner chip device driver * controls all those simple 4-control-bytes style tuners. @@ -514,7 +514,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/linux/include/media/tuner.h b/linux/include/media/tuner.h index 97f456f90..24ffc23d3 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,4 +1,4 @@ -/* $Id: tuner.h,v 1.62 2005/11/25 13:46:01 mchehab Exp $ +/* $Id: tuner.h,v 1.63 2005/11/27 00:06:28 hverkuil Exp $ * tuner.h - definition for different tuners @@ -83,9 +83,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 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 51ec7c153..989e14550 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,13 @@ +2005-11-27 00:03 hverkuil + + * ../linux/drivers/media/video/tuner-simple.c: + * ../linux/include/media/tuner.h: + + Fix wrong tuner define. Tuner 46 is a TUNER_PANASONIC_VP27, + not a Microtune. + + Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> + 2005-11-26 23:40 mchehab * ../linux/Documentation/dvb/README.dvb-usb: |