diff options
| -rw-r--r-- | linux/drivers/media/radio/radio-aimslab.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/radio/radio-aztech.c | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 13 |
3 files changed, 11 insertions, 6 deletions
diff --git a/linux/drivers/media/radio/radio-aimslab.c b/linux/drivers/media/radio/radio-aimslab.c index 94aa44269..66c0ceb16 100644 --- a/linux/drivers/media/radio/radio-aimslab.c +++ b/linux/drivers/media/radio/radio-aimslab.c @@ -377,7 +377,7 @@ static struct video_device rtrack_radio= .owner = THIS_MODULE, .name = "RadioTrack radio", .type = VID_TYPE_TUNER, - .hardware = VID_HARDWARE_RTRACK, + .hardware = 0, .fops = &rtrack_fops, }; diff --git a/linux/drivers/media/radio/radio-aztech.c b/linux/drivers/media/radio/radio-aztech.c index 1942afa3e..a59a6d209 100644 --- a/linux/drivers/media/radio/radio-aztech.c +++ b/linux/drivers/media/radio/radio-aztech.c @@ -333,7 +333,7 @@ static struct video_device aztech_radio= .owner = THIS_MODULE, .name = "Aztech radio", .type = VID_TYPE_TUNER, - .hardware = VID_HARDWARE_AZTECH, + .hardware = 0, .fops = &aztech_fops, }; 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 */ |