aboutsummaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 8266d5ade2ff..c7c40f1d2624 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -62,6 +62,8 @@ struct v4l2_file_operations {
62 unsigned int (*poll) (struct file *, struct poll_table_struct *); 62 unsigned int (*poll) (struct file *, struct poll_table_struct *);
63 long (*ioctl) (struct file *, unsigned int, unsigned long); 63 long (*ioctl) (struct file *, unsigned int, unsigned long);
64 long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long); 64 long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
65 unsigned long (*get_unmapped_area) (struct file *, unsigned long,
66 unsigned long, unsigned long, unsigned long);
65 int (*mmap) (struct file *, struct vm_area_struct *); 67 int (*mmap) (struct file *, struct vm_area_struct *);
66 int (*open) (struct file *); 68 int (*open) (struct file *);
67 int (*release) (struct file *); 69 int (*release) (struct file *);
@@ -126,8 +128,8 @@ struct video_device
126 struct mutex *lock; 128 struct mutex *lock;
127}; 129};
128 130
129#define media_entity_to_video_device(entity) \ 131#define media_entity_to_video_device(__e) \
130 container_of(entity, struct video_device, entity) 132 container_of(__e, struct video_device, entity)
131/* dev to video-device */ 133/* dev to video-device */
132#define to_video_device(cd) container_of(cd, struct video_device, dev) 134#define to_video_device(cd) container_of(cd, struct video_device, dev)
133 135