diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-15 14:15:33 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-15 14:15:33 -0300 |
commit | a2aa04e72cd03545056bd4a9a7cdd6b340908ca2 (patch) | |
tree | 88c1ef6c2b2289b4ef3f9d1bbe5cfd5efc9696ae /linux/drivers/media/video/tveeprom.c | |
parent | 0a6e7fde238f94e6a9d873258e77baa775942b81 (diff) | |
parent | 19feaccb78f2227bb372389fe38dcdafa0880bb0 (diff) | |
download | mediapointer-dvb-s2-a2aa04e72cd03545056bd4a9a7cdd6b340908ca2.tar.gz mediapointer-dvb-s2-a2aa04e72cd03545056bd4a9a7cdd6b340908ca2.tar.bz2 |
merge: http://www.linuxtv.org/hg/~dougsland/em28xx
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/tveeprom.c')
-rw-r--r-- | linux/drivers/media/video/tveeprom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/tveeprom.c b/linux/drivers/media/video/tveeprom.c index 7d6459dd2..5e3c9f4e2 100644 --- a/linux/drivers/media/video/tveeprom.c +++ b/linux/drivers/media/video/tveeprom.c @@ -185,7 +185,7 @@ hauppauge_tuner[] = { TUNER_ABSENT, "Silicon TDA8275C1 8290 FM"}, { TUNER_ABSENT, "Thompson DTT757"}, /* 80-89 */ - { TUNER_PHILIPS_FM1216ME_MK3, "Philips FQ1216LME MK3"}, + { TUNER_PHILIPS_FQ1216LME_MK3, "Philips FQ1216LME MK3"}, { TUNER_LG_PAL_NEW_TAPC, "LG TAPC G701D"}, { TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"}, { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"}, @@ -230,7 +230,7 @@ hauppauge_tuner[] = { TUNER_ABSENT, "Samsung THPD5222FG30A"}, /* 120-129 */ { TUNER_XC2028, "Xceive XC3028"}, - { TUNER_ABSENT, "Philips FQ1216LME MK5"}, + { TUNER_PHILIPS_FQ1216LME_MK3, "Philips FQ1216LME MK5"}, { TUNER_ABSENT, "Philips FQD1216LME"}, { TUNER_ABSENT, "Conexant CX24118A"}, { TUNER_ABSENT, "TCL DMF11WIP"}, |