summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/arv.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/arv.c')
-rw-r--r--linux/drivers/media/video/arv.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/arv.c b/linux/drivers/media/video/arv.c
index 88507ed9b..8d8d339b5 100644
--- a/linux/drivers/media/video/arv.c
+++ b/linux/drivers/media/video/arv.c
@@ -30,9 +30,7 @@
#include "compat.h"
#include <linux/videodev.h>
#include <media/v4l2-common.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
#include <linux/mutex.h>
-#endif
#include <asm/uaccess.h>
#include <asm/m32r.h>
@@ -118,11 +116,7 @@ struct ar_device {
int width, height;
int frame_bytes, line_bytes;
wait_queue_head_t wait;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
struct mutex lock;
-#else
- struct semaphore lock;
-#endif
};
static int video_nr = -1; /* video device number (first free) */