summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/tuner-simple.c6
-rw-r--r--linux/drivers/media/video/tveeprom.c4
-rw-r--r--linux/include/media/tuner.h2
3 files changed, 7 insertions, 5 deletions
diff --git a/linux/drivers/media/video/tuner-simple.c b/linux/drivers/media/video/tuner-simple.c
index c00770441..d3e1ffac2 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.9 2005/03/04 09:24:56 kraxel Exp $
+ * $Id: tuner-simple.c,v 1.10 2005/03/08 08:38:00 kraxel Exp $
*
* i2c tv tuner chip device driver
* controls all those simple 4-control-bytes style tuners.
@@ -205,10 +205,10 @@ static struct tunertype tuners[] = {
16*160.00,16*454.00,0x41,0x42,0x04,0x8e,940}, // UHF band untested
{ "tda8290+75", Philips,PAL|NTSC,
/* see tda8290.c for details */ },
- { "LG PAL (TAPE series, pvr150)", LGINNOTEK, PAL,
+ { "LG PAL (TAPE series)", LGINNOTEK, PAL,
16*170.00, 16*450.00, 0x01,0x02,0x08,0xce,623},
- { "Philips PAL/SECAM multi (FM1216ME pvr150)", Philips, PAL,
+ { "Philips PAL/SECAM multi (FQ1216AME MK4)", Philips, PAL,
16*160.00,16*442.00,0x01,0x02,0x04,0xce,623 },
{ "Philips FQ1236A MK4", Philips, NTSC,
16*160.00,16*442.00,0x01,0x02,0x04,0x8e,732 },
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index d4904444c..faee59184 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -193,11 +193,13 @@ hauppauge_tuner[] =
{ TUNER_ABSENT, "TCL MFPE05 2"},
/* 90-99 */
{ TUNER_ABSENT, "LG TALN H202T"},
- { TUNER_ABSENT, "Philips FQ1216AME MK4"},
+ { TUNER_PHILIPS_FQ1216AME_MK4, "Philips FQ1216AME MK4"},
{ TUNER_PHILIPS_FQ1236A_MK4, "Philips FQ1236A MK4"},
{ TUNER_ABSENT, "Philips FQ1286A MK4"},
{ TUNER_ABSENT, "Philips FQ1216ME MK5"},
{ TUNER_ABSENT, "Philips FQ1236 MK5"},
+ { TUNER_ABSENT, "Unspecified"},
+ { TUNER_LG_PAL_TAPE, "LG PAL (TAPE Series)"},
};
static char *sndtype[] = {
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 05b033797..156a9c51f 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -95,7 +95,7 @@
#define TUNER_PHILIPS_TDA8290 54
#define TUNER_LG_PAL_TAPE 55 /* Hauppauge PVR-150 PAL */
-#define TUNER_PHILIPS_FM1216ME 56 /* Hauppauge PVR-150 PAL */
+#define TUNER_PHILIPS_FQ1216AME_MK4 56 /* Hauppauge PVR-150 PAL */
#define TUNER_PHILIPS_FQ1236A_MK4 57 /* Hauppauge PVR-500MCE NTSC */
#define NOTUNER 0