diff options
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 2 | ||||
| -rw-r--r-- | linux/drivers/usb/media/em2820-video.c | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev.h | 2 | ||||
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 |
4 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index 01fdd456e..b6b600c5b 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -1827,7 +1827,6 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev, } #if 0 dev->vbi_dev = video_device_alloc(); - dev->vbi_dev->owner = THIS_MODULE; dev->vbi_dev->type = VID_TYPE_TELETEXT; dev->vbi_dev->hardware = 0; dev->vbi_dev->fops = &em2820_v4l_fops; @@ -1838,7 +1837,6 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev, "em2820 vbi"); #endif - dev->vdev->owner = THIS_MODULE; dev->vdev->type = VID_TYPE_CAPTURE; if (dev->has_tuner) dev->vdev->type |= VID_TYPE_TUNER; diff --git a/linux/drivers/usb/media/em2820-video.c b/linux/drivers/usb/media/em2820-video.c index 01fdd456e..b6b600c5b 100644 --- a/linux/drivers/usb/media/em2820-video.c +++ b/linux/drivers/usb/media/em2820-video.c @@ -1827,7 +1827,6 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev, } #if 0 dev->vbi_dev = video_device_alloc(); - dev->vbi_dev->owner = THIS_MODULE; dev->vbi_dev->type = VID_TYPE_TELETEXT; dev->vbi_dev->hardware = 0; dev->vbi_dev->fops = &em2820_v4l_fops; @@ -1838,7 +1837,6 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev, "em2820 vbi"); #endif - dev->vdev->owner = THIS_MODULE; dev->vdev->type = VID_TYPE_CAPTURE; if (dev->has_tuner) dev->vdev->type |= VID_TYPE_TUNER; diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index 2f2bb1c84..2ad4ee8c8 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 1 /* to be removed in 2.7.x */ +#if 0 /* to be removed in 2.7.x */ /* 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 24a4978bc..de847e81a 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -68,7 +68,7 @@ struct video_device int (*initialize)(struct video_device *); #endif -#if 1 /* to be removed in 2.7.x */ +#if 0 /* to be removed in 2.7.x */ /* obsolete -- fops->owner is used instead */ struct module *owner; /* dev->driver_data will be used instead some day. |