summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/stv680.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/stv680.h')
-rw-r--r--linux/drivers/media/video/stv680.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/linux/drivers/media/video/stv680.h b/linux/drivers/media/video/stv680.h
index cbbcd4f25..a08f1b08a 100644
--- a/linux/drivers/media/video/stv680.h
+++ b/linux/drivers/media/video/stv680.h
@@ -118,11 +118,7 @@ struct usb_stv {
int origGain;
int origMode; /* original camera mode */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex lock; /* to lock the structure */
-#else
- struct semaphore lock; /* to lock the structure */
-#endif
int user; /* user count for exclusive use */
int removed; /* device disconnected */
int streaming; /* Are we streaming video? */