Merge branch 'upstream' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6...

[linux-2.6] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 039c77e02d3474c2ed32566c22364ddbe35b40e2..017fed7d5e4d24fee81d3b7a3994ab24d401939e 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -110,7 +110,7 @@
 
 #define TUNER_LG_TDVS_H062F            64      /* DViCO FusionHDTV 5 */
 #define TUNER_YMEC_TVF66T5_B_DFF       65      /* Acorp Y878F */
-#define TUNER_LG_NTSC_TALN_MINI                66
+#define TUNER_LG_TALN                  66
 #define TUNER_PHILIPS_TD1316           67
 
 #define TUNER_PHILIPS_TUV1236D         68      /* ATI HDTV Wonder */
@@ -118,7 +118,7 @@
 #define TUNER_SAMSUNG_TCPN_2121P30A     70     /* Hauppauge PVR-500MCE NTSC */
 #define TUNER_XCEIVE_XC3028            71
 
-#define TUNER_FE6600                   72      /* DViCO FusionHDTV DVB-T Hybrid */
+#define TUNER_THOMSON_FE6600           72      /* DViCO FusionHDTV DVB-T Hybrid */
 
 /* tv card specific */
 #define TDA9887_PRESENT                (1<<0)