summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 11:00:22 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-03 11:00:22 -0300
commitaec12fb2da90fde6ec9056cec90f9a65a8b02305 (patch)
tree165e7fde6514536d9e2f4f4bafd21be43ddca55e /linux/include/media
parent57666826019dd00470e7838c4edf8e558f0b56dd (diff)
parent78d3abf60e2a313a3ae4173b47d58a9e79c6d58e (diff)
downloadmediapointer-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/media')
-rw-r--r--linux/include/media/ir-common.h1
-rw-r--r--linux/include/media/tuner.h1
2 files changed, 2 insertions, 0 deletions
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)