diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 13:59:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-14 13:59:05 -0700 |
| commit | 44e3ff32ac229a10a30b7b840f092f5b32a5f72a (patch) | |
| tree | a219aced0374eda136b937b2c3f807464a346d92 /include/media/v4l2-dev.h | |
| parent | 7a1fa065a0264f6b3d3003ba5635289f6583c478 (diff) | |
| parent | e90ff9239e7636a191a8998a70cea220a2c58cdf (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (6220a): fix build error for et61x251 driver
V4L/DVB (6188): Avoid a NULL pointer dereference during mpeg_open()
V4L/DVB (6173a): Documentation: Remove reference to dead "cpia_pp=" boot-time option
V4L/DVB (6148): Fix a warning at saa7191_probe
V4L/DVB (6147): Pwc: Fix a broken debug message
V4L/DVB (6144): Fix mux setup for composite sound on AverTV 307
V4L/DVB (6095): ivtv: fix VIDIOC_G_ENC_INDEX flag handling
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) |