diff options
Diffstat (limited to 'linux/drivers/media/video/meye.h')
-rw-r--r-- | linux/drivers/media/video/meye.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/linux/drivers/media/video/meye.h b/linux/drivers/media/video/meye.h index c5c8d0a0a..4c0c031d3 100644 --- a/linux/drivers/media/video/meye.h +++ b/linux/drivers/media/video/meye.h @@ -263,9 +263,7 @@ /* private API definitions */ #include <linux/meye.h> -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> -#endif /* Enable jpg software correction */ @@ -308,11 +306,7 @@ struct meye { /* list of buffers */ struct meye_grab_buffer grab_buffer[MEYE_MAX_BUFNBRS]; int vma_use_count[MEYE_MAX_BUFNBRS]; /* mmap count */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex lock; /* mutex for open/mmap... */ -#else - struct semaphore lock; /* mutex for open/mmap... */ -#endif struct kfifo *grabq; /* queue for buffers to be grabbed */ spinlock_t grabq_lock; /* lock protecting the queue */ struct kfifo *doneq; /* queue for grabbed buffers */ |