summaryrefslogtreecommitdiff
path: root/linux/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-10-03 20:50:08 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-10-03 20:50:08 -0300
commit7abb8b36755e703f7a0358231389d60c375ecc04 (patch)
treec3546bcf718099e257adf91d48c4209c379034e0 /linux/drivers/media
parentfafe3c59fee78749e4cc500a93fe9754a73683fc (diff)
parent11255722295705ec801399ca48c8a36f3aa8fffe (diff)
downloadmediapointer-dvb-s2-7abb8b36755e703f7a0358231389d60c375ecc04.tar.gz
mediapointer-dvb-s2-7abb8b36755e703f7a0358231389d60c375ecc04.tar.bz2
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
-rw-r--r--linux/drivers/media/video/tveeprom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c
index 7670ae921..f963cee12 100644
--- a/linux/drivers/media/video/tveeprom.c
+++ b/linux/drivers/media/video/tveeprom.c
@@ -226,8 +226,8 @@ hauppauge_tuner[] =
{ TUNER_TCL_2002MB, "TCL M2523_3DB_E"},
{ TUNER_ABSENT, "Philips 8275A"},
{ TUNER_ABSENT, "Microtune MT2060"},
- { TUNER_ABSENT, "Philips FM1236 MK5"},
- { TUNER_ABSENT, "Philips FM1216ME MK5"},
+ { TUNER_PHILIPS_FM1236_MK3, "Philips FM1236 MK5"},
+ { TUNER_PHILIPS_FM1216ME_MK3, "Philips FM1216ME MK5"},
{ TUNER_ABSENT, "TCL M2523_3DI_E"},
{ TUNER_ABSENT, "Samsung THPD5222FG30A"},
/* 120-129 */