diff options
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/ir-common.h | 1 | ||||
| -rw-r--r-- | linux/include/media/videobuf-core.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index a4274203f..20f1afe21 100644 --- a/linux/include/media/ir-common.h +++ b/linux/include/media/ir-common.h @@ -107,6 +107,7 @@ 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_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]; extern IR_KEYTAB_TYPE ir_codes_nebula[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_dntv_live_dvb_t[IR_KEYTAB_SIZE]; extern IR_KEYTAB_TYPE ir_codes_iodata_bctv7e[IR_KEYTAB_SIZE]; diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h index b73f0ffa8..b94057eac 100644 --- a/linux/include/media/videobuf-core.h +++ b/linux/include/media/videobuf-core.h @@ -155,7 +155,7 @@ struct videobuf_queue { struct semaphore vb_lock; #endif spinlock_t *irqlock; - void *dev; /* on pci, points to struct pci_dev */ + struct device *dev; enum v4l2_buf_type type; unsigned int inputs; /* for V4L2_BUF_FLAG_INPUT */ @@ -189,7 +189,7 @@ void *videobuf_alloc(struct videobuf_queue* q); void videobuf_queue_core_init(struct videobuf_queue *q, struct videobuf_queue_ops *ops, - void *dev, + struct device *dev, spinlock_t *irqlock, enum v4l2_buf_type type, enum v4l2_field field, |