diff options
Diffstat (limited to 'linux/include/media/v4l2-dev.h')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index dd49f377d..c9a259b4f 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -9,7 +9,8 @@ #ifndef _V4L2_DEV_H #define _V4L2_DEV_H -#define OBSOLETE_OWNER 1 /* to be removed soon */ +#define OBSOLETE_OWNER 1 /* to be removed soon */ +#define OBSOLETE_DEVDATA 1 /* to be removed soon */ #include <linux/poll.h> #include <linux/fs.h> @@ -364,8 +365,6 @@ extern int video_usercopy(struct inode *inode, struct file *file, #ifdef HAVE_V4L1 #include <linux/mm.h> -extern struct video_device* video_devdata(struct file*); - #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 @@ -396,10 +395,16 @@ static inline void video_set_drvdata(struct video_device *dev, void *data) { dev->priv = data; } + #endif +#endif /* HAVE_V4L1 */ + +#ifdef OBSOLETE_DEVDATA /* to be removed soon */ +/* Obsolete stuff - Still needed for radio devices and obsolete drivers */ +extern struct video_device* video_devdata(struct file*); extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file); -#endif /* HAVE_V4L1 */ +#endif #endif /* _V4L2_DEV_H */ |