diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-09-14 02:09:01 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-09-14 18:39:12 +0200 |
| commit | e90ff9239e7636a191a8998a70cea220a2c58cdf (patch) | |
| tree | 6839c8d14e181ba97c975cfdee187822dc087c9d /include/media/v4l2-dev.h | |
| parent | V4L/DVB (6188): Avoid a NULL pointer dereference during mpeg_open() (diff) | |
| download | linux-e90ff9239e7636a191a8998a70cea220a2c58cdf.tar.xz linux-e90ff9239e7636a191a8998a70cea220a2c58cdf.zip | |
V4L/DVB (6220a): fix build error for et61x251 driver
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/v4l2-dev.h')
| -rw-r--r-- | include/media/v4l2-dev.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index d62847f846c2..17f8f3a2f0a3 100644 --- a/include/media/v4l2-dev.h +++ b/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) |