diff options
Diffstat (limited to 'linux/drivers/media/video/usbvision/usbvision.h')
| -rw-r--r-- | linux/drivers/media/video/usbvision/usbvision.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/usbvision/usbvision.h b/linux/drivers/media/video/usbvision/usbvision.h index 0cd172e1a..b3232d91c 100644 --- a/linux/drivers/media/video/usbvision/usbvision.h +++ b/linux/drivers/media/video/usbvision/usbvision.h @@ -34,6 +34,9 @@ #include <linux/list.h> #include <linux/usb.h> #include <linux/i2c.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) +#include <linux/mutex.h> +#endif #include <media/v4l2-common.h> #include <media/tuner.h> #include <linux/videodev2.h> @@ -397,7 +400,11 @@ struct usb_usbvision { unsigned char iface; /* Video interface number */ unsigned char ifaceAlt; /* Alt settings */ unsigned char Vin_Reg2_Preset; - struct semaphore lock; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) + struct mutex lock; +#else + struct semaphore lock; +#endif struct timer_list powerOffTimer; #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) struct tq_struct powerOffTask; |