diff options
Diffstat (limited to 'linux/drivers/media/video/usbvideo/usbvideo.h')
| -rw-r--r-- | linux/drivers/media/video/usbvideo/usbvideo.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/linux/drivers/media/video/usbvideo/usbvideo.h b/linux/drivers/media/video/usbvideo/usbvideo.h index c1f892825..03b3add3d 100644 --- a/linux/drivers/media/video/usbvideo/usbvideo.h +++ b/linux/drivers/media/video/usbvideo/usbvideo.h @@ -19,9 +19,7 @@ #include <linux/videodev.h> #include <media/v4l2-common.h> #include <linux/usb.h> -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> -#endif #include "compat.h" /* Most helpful debugging aid */ @@ -217,11 +215,7 @@ struct uvd { unsigned long flags; /* FLAGS_USBVIDEO_xxx */ unsigned long paletteBits; /* Which palettes we accept? */ unsigned short defaultPalette; /* What palette to use for read() */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex lock; -#else - struct semaphore lock; -#endif int user; /* user count for exclusive use */ videosize_t videosize; /* Current setting */ @@ -280,11 +274,7 @@ struct usbvideo { int num_cameras; /* As allocated */ struct usb_driver usbdrv; /* Interface to the USB stack */ char drvName[80]; /* Driver name */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex lock; /* Mutex protecting camera structures */ -#else - struct semaphore lock; -#endif struct usbvideo_cb cb; /* Table of callbacks (virtual methods) */ struct video_device vdt; /* Video device template */ struct uvd *cam; /* Array of camera structures */ |