summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2005-12-01 09:52:04 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-02 00:49:00 +0100
commita72403594ad23bbd2ac0349dd0e537b28862faac (patch)
tree738a895e1a76ca42c3ae45d472b0b7c191d89c24 /drivers/media
parent[PATCH] V4L/dvb: fix kernel message (print of %s from random pointer) (diff)
downloadlinux-a72403594ad23bbd2ac0349dd0e537b28862faac.tar.xz
linux-a72403594ad23bbd2ac0349dd0e537b28862faac.zip
[PATCH] V4l/dvb: Restore missing tuner definition for Hauppauge tuner type 0x103
Type 0x103 ("TCL MFNM05-4") in the Hauppauge eeprom is a more recent tuner that maps to TUNER_PHILIPS_FM1236_MK3. This had been previously defined but due to some accident the definition got removed. This change restores that definition. Change committed on advice from Hans Verkuil <hverkuil@xs4all.nl>, who thinks he's the one who had accidentally removed it before. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/tveeprom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 3a986c2a0f72..d95aecebbda3 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -209,7 +209,7 @@ hauppauge_tuner[] =
{ TUNER_ABSENT, "Philips FMD1216ME"},
{ TUNER_TEA5767, "Philips TEA5768HL FM Radio"},
{ TUNER_ABSENT, "Panasonic ENV57H12D5"},
- { TUNER_ABSENT, "TCL MFNM05-4"},
+ { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"},
{ TUNER_ABSENT, "TCL MNM05-4"},
{ TUNER_PHILIPS_FM1216ME_MK3, "TCL MPE05-2"},
{ TUNER_ABSENT, "TCL MQNM05-4"},