summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo/vicam.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/usbvideo/vicam.c')
-rw-r--r--linux/drivers/media/video/usbvideo/vicam.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c
index 049f588ae..17f542dfb 100644
--- a/linux/drivers/media/video/usbvideo/vicam.c
+++ b/linux/drivers/media/video/usbvideo/vicam.c
@@ -42,9 +42,7 @@
#include <linux/usb.h>
#include <linux/vmalloc.h>
#include <linux/slab.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include "usbvideo.h"
// #define VICAM_DEBUG
@@ -406,11 +404,7 @@ struct vicam_camera {
struct usb_device *udev; // usb device
/* guard against simultaneous accesses to the camera */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex cam_lock;
-#else
- struct semaphore cam_lock;
-#endif
int is_initialized;
u8 open_count;