diff options
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r-- | include/media/v4l2-dev.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index 1efcacbed01a..15802a067a12 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h | |||
@@ -21,8 +21,7 @@ | |||
21 | #define VFL_TYPE_GRABBER 0 | 21 | #define VFL_TYPE_GRABBER 0 |
22 | #define VFL_TYPE_VBI 1 | 22 | #define VFL_TYPE_VBI 1 |
23 | #define VFL_TYPE_RADIO 2 | 23 | #define VFL_TYPE_RADIO 2 |
24 | #define VFL_TYPE_VTX 3 | 24 | #define VFL_TYPE_MAX 3 |
25 | #define VFL_TYPE_MAX 4 | ||
26 | 25 | ||
27 | struct v4l2_ioctl_callbacks; | 26 | struct v4l2_ioctl_callbacks; |
28 | struct video_device; | 27 | struct video_device; |
@@ -42,8 +41,6 @@ struct v4l2_file_operations { | |||
42 | unsigned int (*poll) (struct file *, struct poll_table_struct *); | 41 | unsigned int (*poll) (struct file *, struct poll_table_struct *); |
43 | long (*ioctl) (struct file *, unsigned int, unsigned long); | 42 | long (*ioctl) (struct file *, unsigned int, unsigned long); |
44 | long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); | 43 | long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); |
45 | unsigned long (*get_unmapped_area) (struct file *, unsigned long, | ||
46 | unsigned long, unsigned long, unsigned long); | ||
47 | int (*mmap) (struct file *, struct vm_area_struct *); | 44 | int (*mmap) (struct file *, struct vm_area_struct *); |
48 | int (*open) (struct file *); | 45 | int (*open) (struct file *); |
49 | int (*release) (struct file *); | 46 | int (*release) (struct file *); |
@@ -97,6 +94,9 @@ struct video_device | |||
97 | 94 | ||
98 | /* ioctl callbacks */ | 95 | /* ioctl callbacks */ |
99 | const struct v4l2_ioctl_ops *ioctl_ops; | 96 | const struct v4l2_ioctl_ops *ioctl_ops; |
97 | |||
98 | /* serialization lock */ | ||
99 | struct mutex *lock; | ||
100 | }; | 100 | }; |
101 | 101 | ||
102 | /* dev to video-device */ | 102 | /* dev to video-device */ |