diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 14:51:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 14:51:50 -0300 |
| commit | 88778479f1fa5916aa079b9c17929716ebc182a6 (patch) | |
| tree | 8960ed0705c81262a8b534cf182c6b56d07bb6b4 /linux/include/media | |
| parent | 5fa51c4127709c7bcbcbbc6e14b4780908e36990 (diff) | |
| parent | edd1d19fe9c951f51b87b6a614f3e5abc2a6c12e (diff) | |
| download | mediapointer-dvb-s2-88778479f1fa5916aa079b9c17929716ebc182a6.tar.gz mediapointer-dvb-s2-88778479f1fa5916aa079b9c17929716ebc182a6.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/cinergyT2
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/ir-common.h | 4 | ||||
| -rw-r--r-- | linux/include/media/tuner.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 6f8ef35de..436360ed0 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -110,6 +110,7 @@ void ir_rc5_timer_keyup(unsigned long data); extern IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_avermedia[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_avermedia_dvbt[IR_KEYTAB_SIZE]; +extern IR_KEYTAB_TYPE ir_codes_avermedia_m135a[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_pixelview[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_pixelview_new[IR_KEYTAB_SIZE]; @@ -153,7 +154,8 @@ extern IR_KEYTAB_TYPE ir_codes_pinnacle_pctv_hd[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_powercolor_real_angel[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_avermedia_a16d[IR_KEYTAB_SIZE]; - +extern IR_KEYTAB_TYPE ir_codes_encore_enltv_fm53[IR_KEYTAB_SIZE]; +extern IR_KEYTAB_TYPE ir_codes_real_audio_220_32_keys[IR_KEYTAB_SIZE]; #endif /* diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index ba818985c..67c1f514d 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -179,7 +179,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__ */ |