From 6cb6f415645d1ee7acbfdc0829da759aaefe3e8e Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 1 Oct 2007 09:20:34 -0300 Subject: backport kernel changes From: Mauro Carvalho Chehab kernel-sync: A few changes were done at mainstream, affecting v4l/dvb drivers. Backport those changes to the out-kernel tree. Signed-off-by: Mauro Carvalho Chehab --- linux/include/media/v4l2-dev.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linux/include') diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 24ab95924..45dfc7a04 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -363,6 +363,9 @@ void *priv; #endif }; +/* 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 *); @@ -385,7 +388,6 @@ extern int video_usercopy(struct inode *inode, struct file *file, #include #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) -#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) -- cgit v1.2.3