V4L/DVB (11034): soc-camera: remove now unused gpio member of struct soc_camera_link

[safe/jmp/linux-2.6] / include / media / v4l2-dev.h

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 4d8ce34..e36faab 100644 (file)
--- 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 *);