Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / media / video / meye.c

diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 850bee9..f68ca7d 100644 (file)
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -32,6 +32,7 @@
 #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 +1683,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]--;
 }