diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 23:50:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:17:52 -0400 |
commit | f87086e302300fdff1bd32049deb7a7f3e3de7da (patch) | |
tree | 27b42587cf577a63d9f79ccb27267e0dea7188cb /drivers/media/video/uvc | |
parent | e01117c81676dc9897f567e32cdc13a26e85280b (diff) |
v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
Also remove some blank lines that were used to split compat code at -devel
tree.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/uvc')
-rw-r--r-- | drivers/media/video/uvc/uvc_ctrl.c | 1 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvc_driver.c | 1 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvc_queue.c | 1 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvc_status.c | 1 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvc_v4l2.c | 1 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvc_video.c | 1 | ||||
-rw-r--r-- | drivers/media/video/uvc/uvcvideo.h | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index f0ee46d15540..3ae95512666f 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c | |||
@@ -1254,3 +1254,4 @@ void uvc_ctrl_init(void) | |||
1254 | for (; mapping < mend; ++mapping) | 1254 | for (; mapping < mend; ++mapping) |
1255 | uvc_ctrl_add_mapping(mapping); | 1255 | uvc_ctrl_add_mapping(mapping); |
1256 | } | 1256 | } |
1257 | |||
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index 86bb16d00173..31a0e706a7f6 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
@@ -1954,3 +1954,4 @@ MODULE_AUTHOR(DRIVER_AUTHOR); | |||
1954 | MODULE_DESCRIPTION(DRIVER_DESC); | 1954 | MODULE_DESCRIPTION(DRIVER_DESC); |
1955 | MODULE_LICENSE("GPL"); | 1955 | MODULE_LICENSE("GPL"); |
1956 | MODULE_VERSION(DRIVER_VERSION); | 1956 | MODULE_VERSION(DRIVER_VERSION); |
1957 | |||
diff --git a/drivers/media/video/uvc/uvc_queue.c b/drivers/media/video/uvc/uvc_queue.c index 0923f0e3b3d4..7388d0cee3d4 100644 --- a/drivers/media/video/uvc/uvc_queue.c +++ b/drivers/media/video/uvc/uvc_queue.c | |||
@@ -475,3 +475,4 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue, | |||
475 | wake_up(&buf->wait); | 475 | wake_up(&buf->wait); |
476 | return nextbuf; | 476 | return nextbuf; |
477 | } | 477 | } |
478 | |||
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c index 06b47980ed98..7bfddad37d8c 100644 --- a/drivers/media/video/uvc/uvc_status.c +++ b/drivers/media/video/uvc/uvc_status.c | |||
@@ -205,3 +205,4 @@ int uvc_status_resume(struct uvc_device *dev) | |||
205 | 205 | ||
206 | return usb_submit_urb(dev->int_urb, GFP_NOIO); | 206 | return usb_submit_urb(dev->int_urb, GFP_NOIO); |
207 | } | 207 | } |
208 | |||
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 2e0a66575bb4..0456bbdcd695 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
@@ -1103,3 +1103,4 @@ struct file_operations uvc_fops = { | |||
1103 | .mmap = uvc_v4l2_mmap, | 1103 | .mmap = uvc_v4l2_mmap, |
1104 | .poll = uvc_v4l2_poll, | 1104 | .poll = uvc_v4l2_poll, |
1105 | }; | 1105 | }; |
1106 | |||
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 817af2e36362..ad63794fda77 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
@@ -964,3 +964,4 @@ int uvc_video_enable(struct uvc_video_device *video, int enable) | |||
964 | 964 | ||
965 | return uvc_init_video(video, GFP_KERNEL); | 965 | return uvc_init_video(video, GFP_KERNEL); |
966 | } | 966 | } |
967 | |||
diff --git a/drivers/media/video/uvc/uvcvideo.h b/drivers/media/video/uvc/uvcvideo.h index 2444b8a9d2a0..bafe3406e305 100644 --- a/drivers/media/video/uvc/uvcvideo.h +++ b/drivers/media/video/uvc/uvcvideo.h | |||
@@ -796,3 +796,4 @@ void uvc_video_decode_isight(struct urb *urb, struct uvc_video_device *video, | |||
796 | #endif /* __KERNEL__ */ | 796 | #endif /* __KERNEL__ */ |
797 | 797 | ||
798 | #endif | 798 | #endif |
799 | |||