X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fmedia%2Fv4l2-dev.h;h=e36faab8459b873f7ec07147abbcb834a12861cf;hb=d42574d1d26a17b5c4a3e9d5cbd2e5cacfd550fa;hp=4d8ce34551df4db9952525c63288a5d050c1f6ee;hpb=bec43661b1dc0075b7445223ba775674133b164d;p=safe%2Fjmp%2Flinux-2.6

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 4d8ce34..e36faab 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -38,7 +38,7 @@ struct v4l2_file_operations {
 	ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
 	ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
 	unsigned int (*poll) (struct file *, struct poll_table_struct *);
-	int (*ioctl) (struct file *, unsigned int, unsigned long);
+	long (*ioctl) (struct file *, unsigned int, unsigned long);
 	long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
 	int (*mmap) (struct file *, struct vm_area_struct *);
 	int (*open) (struct file *);