---

yaml --- r: 64927 b: refs/heads/master c: e90ff92 h: refs/heads/master i: 64925: f08f3fd 64923: a9b6d49 64919: 0304448 64911: c680e5e 64895: da6a811 v: v3
git-mirror · Sep 14, 2007 · 154ef7b · 154ef7b
1 parent 3971cd5
commit 154ef7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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 <linux/mm.h>
 
-#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)