summaryrefslogtreecommitdiff
path: root/linux/include/media/ir-common.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-05-19 11:11:16 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-05-19 11:11:16 -0300
commit8bf2cc99d48eabe83872a51ceb427ea64cff7207 (patch)
tree214200fa2cb8d56f69d407cade04d4a110ca3e5b /linux/include/media/ir-common.h
parentc7b8d03d39aaf7055bb88d7983839eaee56c62db (diff)
parentf40e092350ab797c7d40bb399d287a20a1f4f649 (diff)
downloadmediapointer-dvb-s2-8bf2cc99d48eabe83872a51ceb427ea64cff7207.tar.gz
mediapointer-dvb-s2-8bf2cc99d48eabe83872a51ceb427ea64cff7207.tar.bz2
merge: http://linuxtv.org/hg/~pb/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/ir-common.h')
-rw-r--r--linux/include/media/ir-common.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h
index 302d5b394..f0beace1f 100644
--- a/linux/include/media/ir-common.h
+++ b/linux/include/media/ir-common.h
@@ -73,7 +73,7 @@ extern IR_KEYTAB_TYPE ir_codes_cinergy_1400[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_avertv_303[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_dntv_live_dvbt_pro[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_em_terratec[IR_KEYTAB_SIZE];
-extern IR_KEYTAB_TYPE ir_codes_em_pinnacle_usb[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_pinnacle_grey[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_flyvideo[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_flydvb[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_cinergy[IR_KEYTAB_SIZE];
@@ -87,7 +87,7 @@ extern IR_KEYTAB_TYPE ir_codes_pctv_sedna[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_pv951[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_rc5_tv[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE];
-extern IR_KEYTAB_TYPE ir_codes_pinnacle[IR_KEYTAB_SIZE];
+extern IR_KEYTAB_TYPE ir_codes_pinnacle_color[IR_KEYTAB_SIZE];
extern IR_KEYTAB_TYPE ir_codes_hauppauge_new[IR_KEYTAB_SIZE];
#endif