Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / media / video / tveeprom.c

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 07fabdd..6103d1b 100644 (file)
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -267,21 +267,27 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,                 "Xceive XC4000"},
        { TUNER_ABSENT,                 "Dibcom 7070"},
        { TUNER_PHILIPS_TDA8290,        "NXP 18271C2"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
+       { TUNER_ABSENT,                 "Siano SMS1010"},
+       { TUNER_ABSENT,                 "Siano SMS1150"},
+       { TUNER_ABSENT,                 "MaxLinear 5007"},
+       { TUNER_ABSENT,                 "TCL M09WPP_2P_E"},
        /* 160-169 */
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
-       { TUNER_ABSENT,                 "unknown"},
+       { TUNER_ABSENT,                 "Siano SMS1180"},
+       { TUNER_ABSENT,                 "Maxim_MAX2165"},
+       { TUNER_ABSENT,                 "Siano SMS1140"},
+       { TUNER_ABSENT,                 "Siano SMS1150 B1"},
+       { TUNER_ABSENT,                 "MaxLinear 111"},
+       { TUNER_ABSENT,                 "Dibcom 7770"},
+       { TUNER_ABSENT,                 "Siano SMS1180VNS"},
+       { TUNER_ABSENT,                 "Siano SMS1184"},
        { TUNER_PHILIPS_FQ1236_MK5,     "TCL M30WTP-4N-E"},
-       { TUNER_ABSENT,                 "unknown"},
+       { TUNER_ABSENT,                 "TCL_M11WPP_2PN_E"},
+       /* 170-179 */
+       { TUNER_ABSENT,                 "MaxLinear 301"},
+       { TUNER_ABSENT,                 "Mirics MSi001"},
+       { TUNER_ABSENT,                 "MaxLinear MxL241SF"},
+       { TUNER_ABSENT,                 "Xceive XC5000C"},
+       { TUNER_ABSENT,                 "Montage M68TS2020"},
 };
 
 /* Use V4L2_IDENT_AMBIGUOUS for those audio 'chips' that are