diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 11:00:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 11:00:22 -0300 |
| commit | aec12fb2da90fde6ec9056cec90f9a65a8b02305 (patch) | |
| tree | 165e7fde6514536d9e2f4f4bafd21be43ddca55e /linux/include | |
| parent | 57666826019dd00470e7838c4edf8e558f0b56dd (diff) | |
| parent | 78d3abf60e2a313a3ae4173b47d58a9e79c6d58e (diff) | |
| download | mediapointer-dvb-s2-aec12fb2da90fde6ec9056cec90f9a65a8b02305.tar.gz mediapointer-dvb-s2-aec12fb2da90fde6ec9056cec90f9a65a8b02305.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 6 | ||||
| -rw-r--r-- | linux/include/media/ir-common.h | 1 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 5359c2c76..c6cffb912 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -866,9 +866,9 @@ struct v4l2_querymenu #define V4L2_CID_HFLIP (V4L2_CID_BASE+20) #define V4L2_CID_VFLIP (V4L2_CID_BASE+21) -/* Deprecated, use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ -#define V4L2_CID_HCENTER_DEPRECATED (V4L2_CID_BASE+22) -#define V4L2_CID_VCENTER_DEPRECATED (V4L2_CID_BASE+23) +/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */ +#define V4L2_CID_HCENTER (V4L2_CID_BASE+22) +#define V4L2_CID_VCENTER (V4L2_CID_BASE+23) #define V4L2_CID_POWER_LINE_FREQUENCY (V4L2_CID_BASE+24) enum v4l2_power_line_frequency { diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index bfee8be5d..12036e023 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -139,6 +139,7 @@ extern IR_KEYTAB_TYPE ir_codes_proteus_2309[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_budget_ci_old[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_asus_pc39[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_encore_enltv[IR_KEYTAB_SIZE]; +extern IR_KEYTAB_TYPE ir_codes_encore_enltv2[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_tt_1500[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_fusionhdtv_mce[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE]; diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 77068fcc8..ba818985c 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -122,6 +122,7 @@ #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 */ /* tv card specific */ #define TDA9887_PRESENT (1<<0) |