diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:06:49 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-06-23 03:06:49 -0300 |
| commit | 8b3ed0d52132397a5de88531f5287b5e7864b76e (patch) | |
| tree | 8a2ce91805633daa4063b1910f50c7bad1c327a5 /linux/include/media | |
| parent | 9bd4b1d143281470bf7a00afda20a7368154e213 (diff) | |
| parent | 3f5baede21113b8adf1b40d403e19a1ced1b07b8 (diff) | |
| download | mediapointer-dvb-s2-8b3ed0d52132397a5de88531f5287b5e7864b76e.tar.gz mediapointer-dvb-s2-8b3ed0d52132397a5de88531f5287b5e7864b76e.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-subdev2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/ir-common.h | 2 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 | ||||
| -rw-r--r-- | linux/include/media/v4l2-i2c-drv.h | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 7b5b91f60..9dcb632f6 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -162,6 +162,8 @@ extern IR_KEYTAB_TYPE ir_codes_ati_tv_wonder_hd_600[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_kworld_plus_tv_analog[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_kaiomy[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_dm1105_nec[IR_KEYTAB_SIZE]; +extern IR_KEYTAB_TYPE ir_codes_evga_indtube[IR_KEYTAB_SIZE]; + #endif /* diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 735a2a941..cbf97f45f 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -125,6 +125,7 @@ #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 */ /* tv card specific */ #define TDA9887_PRESENT (1<<0) diff --git a/linux/include/media/v4l2-i2c-drv.h b/linux/include/media/v4l2-i2c-drv.h index 121f0ada0..f5e4ffe27 100644 --- a/linux/include/media/v4l2-i2c-drv.h +++ b/linux/include/media/v4l2-i2c-drv.h @@ -22,7 +22,7 @@ */ /* NOTE: the full version of this header is in the v4l-dvb repository - * and allows v4l i2c drivers to be compiled on older kernels as well. + * and allows v4l i2c drivers to be compiled on pre-2.6.26 kernels. * The version of this header as it appears in the kernel is a stripped * version (without all the backwards compatibility stuff) and so it * looks a bit odd. @@ -30,6 +30,9 @@ * If you look at the full version then you will understand the reason * for introducing this header since you really don't want to have all * the tricky backwards compatibility code in each and every i2c driver. + * + * If the i2c driver will never be compiled for pre-2.6.26 kernels, then + * DO NOT USE this header! Just write it as a regular i2c driver. */ #ifndef __V4L2_I2C_DRV_H__ |