From 154ef7b02428795080af0c61d959232cb3450318 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 13 Sep 2007 21:09:01 -0300 Subject: [PATCH] --- yaml --- r: 64927 b: refs/heads/master c: e90ff9239e7636a191a8998a70cea220a2c58cdf h: refs/heads/master i: 64925: f08f3fdb0660c16e042c69327004232e347fd6d7 64923: a9b6d497894c810f85a5e2bf6c5465624db876e6 64919: 03044487e8f38f4a50d020788c33bf06621855f4 64911: c680e5e3124472845e2bc45433f324eee935c949 64895: da6a811e780c3a7ea4a871addf93c5fb0360003b v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-dev.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3176abfb8fa8..4d2f72082325 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48200baeab95fd39a7f4c4f3536c7142a64ac335 +refs/heads/master: e90ff9239e7636a191a8998a70cea220a2c58cdf diff --git a/trunk/include/media/v4l2-dev.h b/trunk/include/media/v4l2-dev.h index d62847f846c2..17f8f3a2f0a3 100644 --- a/trunk/include/media/v4l2-dev.h +++ b/trunk/include/media/v4l2-dev.h @@ -337,6 +337,9 @@ void *priv; struct class_device class_dev; /* sysfs */ }; +/* Class-dev to video-device */ +#define to_video_device(cd) container_of(cd, struct video_device, class_dev) + /* Version 2 functions */ extern int video_register_device(struct video_device *vfd, int type, int nr); void video_unregister_device(struct video_device *); @@ -354,11 +357,9 @@ extern int video_usercopy(struct inode *inode, struct file *file, int (*func)(struct inode *inode, struct file *file, unsigned int cmd, void *arg)); - #ifdef CONFIG_VIDEO_V4L1_COMPAT #include -#define to_video_device(cd) container_of(cd, struct video_device, class_dev) static inline int __must_check video_device_create_file(struct video_device *vfd, struct class_device_attribute *attr)