diff options
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.h')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.h b/linux/drivers/media/video/cx18/cx18-driver.h index e4f1accd2..b78d0e38d 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.h +++ b/linux/drivers/media/video/cx18/cx18-driver.h @@ -41,9 +41,7 @@ #include <linux/byteorder/swab.h> #include <linux/pagemap.h> #include <linux/workqueue.h> -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15) #include <linux/mutex.h> -#endif #include <linux/dvb/video.h> #include <linux/dvb/audio.h> @@ -232,13 +230,7 @@ struct cx18_dvb { struct dvb_net dvbnet; int enabled; int feeding; - -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15) struct mutex feedlock; -#else - struct semaphore feedlock; -#endif - }; struct cx18; /* forward reference */ @@ -383,11 +375,7 @@ struct cx18 { /* Digitizer type */ int digitizer; /* 0x00EF = saa7114 0x00FO = saa7115 0x0106 = mic */ -#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 struct cx18_options options; /* User options */ int stream_buf_size[CX18_MAX_STREAMS]; /* Stream buffer size */ struct cx18_stream streams[CX18_MAX_STREAMS]; /* Stream data */ @@ -433,11 +421,7 @@ struct cx18 { struct i2c_algo_bit_data i2c_algo[2]; struct cx18_i2c_algo_callback_data i2c_algo_cb_data[2]; struct i2c_client i2c_client[2]; -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 15) struct mutex i2c_bus_lock[2]; -#else - struct semaphore i2c_bus_lock[2]; -#endif struct i2c_client *i2c_clients[I2C_CLIENTS_MAX]; /* gpio */ |