diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/include/linux/videodev.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index 2ad4ee8c8..26b09a153 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -29,7 +29,7 @@ video_device_remove_file(struct video_device *vfd, } #endif -#if 0 /* to be removed in 2.7.x */ +#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) { diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index de847e81a..a82fa7d84 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -15,9 +15,6 @@ */ #ifdef __KERNEL__ #include <linux/time.h> /* need struct timeval */ -#endif -#include <linux/compiler.h> /* need __user */ - #include <linux/poll.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69) #include <linux/devfs_fs_kernel.h> @@ -25,7 +22,11 @@ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include <linux/device.h> #endif +#endif +#include <linux/compiler.h> /* need __user */ + +#define OBSOLETE_OWNER 1 /* It will be removed for 2.6.15 */ #define HAVE_V4L2 1 /* @@ -35,6 +36,8 @@ #define VIDEO_MAX_FRAME 32 +#ifdef __KERNEL__ + #define VFL_TYPE_GRABBER 0 #define VFL_TYPE_VBI 1 #define VFL_TYPE_RADIO 2 @@ -68,7 +71,7 @@ struct video_device int (*initialize)(struct video_device *); #endif -#if 0 /* to be removed in 2.7.x */ +#if OBSOLETE_OWNER /* to be removed in 2.6.15 */ /* obsolete -- fops->owner is used instead */ struct module *owner; /* dev->driver_data will be used instead some day. @@ -120,6 +123,8 @@ extern int video_usercopy(struct inode *inode, struct file *file, struct video_device *video_device_alloc(void); void video_device_release(struct video_device *vfd); +#endif + /* * M I S C E L L A N E O U S */ |