summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc.h')
-rw-r--r--linux/drivers/media/video/pwc/pwc.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/linux/drivers/media/video/pwc/pwc.h b/linux/drivers/media/video/pwc/pwc.h
index c5fe0e13d..d01548d2c 100644
--- a/linux/drivers/media/video/pwc/pwc.h
+++ b/linux/drivers/media/video/pwc/pwc.h
@@ -31,11 +31,7 @@
#include <linux/wait.h>
#include <linux/smp_lock.h>
#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
#include <linux/mutex.h>
-#else
-#include <asm/semaphore.h>
-#endif
#include <asm/errno.h>
#include "compat.h"
#include <linux/videodev.h>
@@ -250,11 +246,7 @@ struct pwc_device
int image_read_pos; /* In case we read data in pieces, keep track of were we are in the imagebuffer */
int image_used[MAX_IMAGES]; /* For MCAPTURE and SYNC */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
struct mutex modlock; /* to prevent races in video_open(), etc */
-#else
- struct semaphore modlock; /* to prevent races in video_open(), etc */
-#endif
spinlock_t ptrlock; /* for manipulating the buffer pointers */
/*** motorized pan/tilt feature */