Merge branch 'linus' into cont_syslog

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

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 97be269..5505c53 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -78,7 +78,7 @@
 
 #define TUNER_HITACHI_NTSC             40
 #define TUNER_PHILIPS_PAL_MK           41
-#define TUNER_PHILIPS_ATSC             42
+#define TUNER_PHILIPS_FCV1236D         42
 #define TUNER_PHILIPS_FM1236_MK3       43
 
 #define TUNER_PHILIPS_4IN1             44      /* ATI TV Wonder Pro - Conexant */
@@ -121,6 +121,15 @@
 #define TUNER_SAMSUNG_TCPG_6121P30A     73     /* Hauppauge PVR-500 PAL */
 #define TUNER_TDA9887                   74      /* This tuner should be used only internally */
 #define TUNER_TEA5761                  75      /* Only FM Radio Tuner */
+#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)
@@ -177,7 +186,7 @@ struct tuner_setup {
        unsigned int    type;   /* Tuner type */
        unsigned int    mode_mask;  /* Allowed tuner modes */
        unsigned int    config; /* configuraion for more complex tuners */
-       int (*tuner_callback) (void *dev, int command,int arg);
+       int (*tuner_callback) (void *dev, int component, int cmd, int arg);
 };
 
 #endif /* __KERNEL__ */