diff options
Diffstat (limited to 'linux/drivers/media/common/saa7146_fops.c')
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 0fa03c3fa..dd92cebbd 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -1,4 +1,5 @@ #include <media/saa7146_vv.h> +#include <linux/version.h> #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) @@ -344,7 +345,12 @@ static int fops_mmap(struct file *file, struct vm_area_struct * vma) BUG(); return 0; } + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) return videobuf_mmap_mapper(vma,q); +#else + return videobuf_mmap_mapper(q,vma); +#endif } static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait) @@ -357,11 +363,7 @@ static unsigned int fops_poll(struct file *file, struct poll_table_struct *wait) if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) { if( 0 == fh->vbi_q.streaming ) -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) return videobuf_poll_stream(file, &fh->vbi_q, wait); -#else - return videobuf_poll_stream(file, file->private_data, &fh->vbi_q, wait); -#endif q = &fh->vbi_q; } else { DEB_D(("using video queue.\n")); |