summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/vino.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/vino.c')
-rw-r--r--linux/drivers/media/video/vino.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c
index bf15e2eb2..60527b164 100644
--- a/linux/drivers/media/video/vino.c
+++ b/linux/drivers/media/video/vino.c
@@ -41,9 +41,7 @@
#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/video_decoder.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
#include <linux/mutex.h>
-#endif
#include <asm/paccess.h>
#include <asm/io.h>
@@ -247,11 +245,7 @@ struct vino_framebuffer_queue {
struct vino_framebuffer *buffer[VINO_FRAMEBUFFER_COUNT_MAX];
spinlock_t queue_lock;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
struct mutex queue_mutex;
-#else
- struct semaphore queue_mutex;
-#endif
wait_queue_head_t frame_wait_queue;
};
@@ -289,11 +283,7 @@ struct vino_channel_settings {
/* the driver is currently processing the queue */
int capturing;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 16)
struct mutex mutex;
-#else
- struct semaphore mutex;
-#endif
spinlock_t capture_lock;
unsigned int users;