summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-driver.h')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-driver.h15
1 files changed, 0 insertions, 15 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index 5134d8a09..7bae21e5b 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.h
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -53,9 +53,7 @@
#include <linux/pagemap.h>
#include <linux/scatterlist.h>
#include <linux/workqueue.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include <asm/uaccess.h>
#include <asm/system.h>
@@ -274,11 +272,7 @@ struct ivtv_sg_host_element {
};
struct ivtv_user_dma {
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex lock;
-#else
- struct semaphore lock;
-#endif
int page_count;
struct page *map[IVTV_DMA_SG_OSD_ENT];
/* Needed when dealing with highmem userspace buffers */
@@ -640,12 +634,7 @@ struct ivtv {
/* Locking */
spinlock_t lock; /* lock access to this struct */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex serialize_lock; /* mutex used to serialize open/close/start/stop/ioctl operations */
-#else
- struct semaphore serialize_lock;/* mutex used to serialize open/close/start/stop/ioctl operations */
-#endif
-
/* Streams */
int stream_buf_size[IVTV_MAX_STREAMS]; /* stream buffer size */
@@ -686,11 +675,7 @@ struct ivtv {
struct i2c_client i2c_client;
struct i2c_client *i2c_clients[I2C_CLIENTS_MAX];/* pointers to all I2C clients */
int i2c_state; /* i2c bit state */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex i2c_bus_lock; /* lock i2c bus */
-#else
- struct semaphore i2c_bus_lock; /* lock i2c bus */
-#endif
/* Program Index information */