diff options
Diffstat (limited to 'drivers/media/video/meye.c')
| -rw-r--r-- | drivers/media/video/meye.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 850bee97090..e278753f8f2 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c @@ -26,12 +26,12 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/pci.h> #include <linux/sched.h> #include <linux/init.h> #include <linux/videodev.h> +#include <media/v4l2-common.h> #include <asm/uaccess.h> #include <asm/io.h> #include <linux/delay.h> @@ -1682,13 +1682,13 @@ static unsigned int meye_poll(struct file *file, poll_table *wait) static void meye_vm_open(struct vm_area_struct *vma) { - int idx = (int)vma->vm_private_data; + long idx = (long)vma->vm_private_data; meye.vma_use_count[idx]++; } static void meye_vm_close(struct vm_area_struct *vma) { - int idx = (int)vma->vm_private_data; + long idx = (long)vma->vm_private_data; meye.vma_use_count[idx]--; } @@ -1881,7 +1881,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev, meye.mchip_irq = pcidev->irq; if (request_irq(meye.mchip_irq, meye_irq, - SA_INTERRUPT | SA_SHIRQ, "meye", meye_irq)) { + IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) { printk(KERN_ERR "meye: request_irq failed\n"); goto outreqirq; } |