diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/media/v4l2-dev.h | 1 | ||||
-rw-r--r-- | include/media/v4l2-device.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 3e4fddfc840c..acbcd2f5fe7f 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -65,7 +65,6 @@ struct v4l2_file_operations { | |||
65 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); | 65 | ssize_t (*read) (struct file *, char __user *, size_t, loff_t *); |
66 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); | 66 | ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *); |
67 | unsigned int (*poll) (struct file *, struct poll_table_struct *); | 67 | unsigned int (*poll) (struct file *, struct poll_table_struct *); |
68 | long (*ioctl) (struct file *, unsigned int, unsigned long); | ||
69 | long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); | 68 | long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); |
70 | #ifdef CONFIG_COMPAT | 69 | #ifdef CONFIG_COMPAT |
71 | long (*compat_ioctl32) (struct file *, unsigned int, unsigned long); | 70 | long (*compat_ioctl32) (struct file *, unsigned int, unsigned long); |
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index ffb69da3ce9e..9c581578783f 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h | |||
@@ -58,8 +58,6 @@ struct v4l2_device { | |||
58 | struct v4l2_ctrl_handler *ctrl_handler; | 58 | struct v4l2_ctrl_handler *ctrl_handler; |
59 | /* Device's priority state */ | 59 | /* Device's priority state */ |
60 | struct v4l2_prio_state prio; | 60 | struct v4l2_prio_state prio; |
61 | /* BKL replacement mutex. Temporary solution only. */ | ||
62 | struct mutex ioctl_lock; | ||
63 | /* Keep track of the references to this struct. */ | 61 | /* Keep track of the references to this struct. */ |
64 | struct kref ref; | 62 | struct kref ref; |
65 | /* Release function that is called when the ref count goes to 0. */ | 63 | /* Release function that is called when the ref count goes to 0. */ |