Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / drivers / media / video / tveeprom.c

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5203683dcc3d6806d7c383f2f2a9c770c65fa415..4b2c4034f5b375be96b3d348f0eb7f4e1b94cfae 100644 (file)
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -30,7 +30,6 @@
 
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -183,7 +182,7 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,        "Silicon TDA8275C1 8290 FM"},
        { TUNER_ABSENT,        "Thompson DTT757"},
        /* 80-89 */
-       { TUNER_ABSENT,        "Philips FQ1216LME MK3"},
+       { TUNER_PHILIPS_FM1216ME_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"},