diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-01 09:20:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-01 09:20:34 -0300 |
| commit | 6cb6f415645d1ee7acbfdc0829da759aaefe3e8e (patch) | |
| tree | 5ab905fecbdd69dbc41a15deabae75ea5595e1c9 /linux/include/media/v4l2-dev.h | |
| parent | e1f9cac1bd52d6d0045cf6583854f1432483334a (diff) | |
| download | mediapointer-dvb-s2-6cb6f415645d1ee7acbfdc0829da759aaefe3e8e.tar.gz mediapointer-dvb-s2-6cb6f415645d1ee7acbfdc0829da759aaefe3e8e.tar.bz2 | |
backport kernel changes
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media/v4l2-dev.h')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 <linux/mm.h> #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) |