Merge branch 'master' into for-linus

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

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 7d4e2db..5505c53 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -124,6 +124,12 @@
 #define TUNER_XC5000                   76      /* Xceive Silicon Tuner */
 #define TUNER_TCL_MF02GIP_5N           77      /* TCL MF02GIP_5N */
 #define TUNER_PHILIPS_FMD1216MEX_MK3   78
+#define TUNER_PHILIPS_FM1216MK5                79
+#define TUNER_PHILIPS_FQ1216LME_MK3    80      /* Active loopthrough, no FM */
+#define TUNER_PARTSNIC_PTI_5NF05       81
+#define TUNER_PHILIPS_CU1216L           82
+#define TUNER_NXP_TDA18271             83
+#define TUNER_SONY_BTF_PXN01Z          84
 
 /* tv card specific */
 #define TDA9887_PRESENT                (1<<0)