summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/Documentation/video4linux/CARDLIST.tuner2
-rw-r--r--linux/drivers/media/video/tuner-simple.c4
-rw-r--r--v4l/ChangeLog8
3 files changed, 11 insertions, 3 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.tuner b/linux/Documentation/video4linux/CARDLIST.tuner
index 9d6544ea9..1d658a388 100644
--- a/linux/Documentation/video4linux/CARDLIST.tuner
+++ b/linux/Documentation/video4linux/CARDLIST.tuner
@@ -40,7 +40,7 @@ tuner=38 - Philips PAL/SECAM multi (FM1216ME MK3)
tuner=39 - LG NTSC (newer TAPC series)
tuner=40 - HITACHI V7-J180AT
tuner=41 - Philips PAL_MK (FI1216 MK)
-tuner=42 - Philips 1236D ATSC/NTSC daul in
+tuner=42 - Philips 1236D ATSC/NTSC dual in
tuner=43 - Philips NTSC MK3 (FM1236MK3 or FM1236/F)
tuner=44 - Philips 4 in 1 (ATI TV Wonder Pro/Conexant)
tuner=45 - Microtune 4049 FM5
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index dcb927785..e4baead24 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.63 2005/12/05 21:32:29 hverkuil Exp $
+ * $Id: tuner-simple.c,v 1.64 2005/12/11 15:35:18 mkrufky Exp $
*
* i2c tv tuner chip device driver
* controls all those simple 4-control-bytes style tuners.
@@ -483,7 +483,7 @@ static struct tunertype tuners[] = {
.config = 0x8e,
},
[TUNER_PHILIPS_ATSC] = { /* Philips ATSC */
- .name = "Philips 1236D ATSC/NTSC daul in",
+ .name = "Philips 1236D ATSC/NTSC dual in",
.thresh1= 16 * 157.25 /*MHz*/,
.thresh2= 16 * 454.00 /*MHz*/,
.VHF_L = 0xa0,
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 1673eb6e8..8585d103e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-11 15:34 mkrufky
+
+ * linux/Documentation/video4linux/CARDLIST.tuner:
+ * linux/drivers/media/video/tuner-simple.c:
+ - "Philips 1236D ATSC/NTSC dual in" - fix typo.
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-12-10 22:17 mchehab
* linux/drivers/media/video/cx88/cx88-video.c: (get_control),