diff options
| -rw-r--r-- | linux/include/linux/videodev.h | 13 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 21 insertions, 0 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index c3ff02435..26b09a153 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -29,6 +29,19 @@ video_device_remove_file(struct video_device *vfd, } #endif +#if OBSOLETE_OWNER /* to be removed in 2.6.15 */ +/* helper functions to access driver private data. */ +static inline void *video_get_drvdata(struct video_device *dev) +{ + return dev->priv; +} + +static inline void video_set_drvdata(struct video_device *dev, void *data) +{ + dev->priv = data; +} +#endif + extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file); #endif /* __KERNEL__ */ diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 028d8916e..1a97f8db5 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-12-12 21:29 mchehab + + * linux/include/linux/videodev.h: + - Reverted patchset 3127 since it breaks pvrusb2 compilation. + - should be reapplied later. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-12 03:39 mchehab * v4l/Make.config: |