diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 01:06:50 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-28 01:06:50 -0200 |
| commit | d444e8da71bac607984628cfa49b0f89c02a2db9 (patch) | |
| tree | 872617e19835ac9a7be010d2ed4ca5487601e357 /linux/drivers/media/video/ivtv | |
| parent | 776b4902b46a245bc73711ea0a27803dee95b7be (diff) | |
| parent | 47eb0997ae6ced96654a3f5a82cdb885d5f8f401 (diff) | |
| download | mediapointer-dvb-s2-d444e8da71bac607984628cfa49b0f89c02a2db9.tar.gz mediapointer-dvb-s2-d444e8da71bac607984628cfa49b0f89c02a2db9.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/ivtv-compat
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv')
| -rw-r--r-- | linux/drivers/media/video/ivtv/ivtv-driver.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h index 546d7bbfc..3daf1a9fc 100644 --- a/linux/drivers/media/video/ivtv/ivtv-driver.h +++ b/linux/drivers/media/video/ivtv/ivtv-driver.h @@ -53,7 +53,9 @@ #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 <asm/uaccess.h> #include <asm/system.h> @@ -413,7 +415,11 @@ struct ivtv_SG_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]; @@ -778,7 +784,11 @@ struct ivtv { struct i2c_adapter i2c_adap; struct i2c_algo_bit_data i2c_algo; struct i2c_client i2c_client; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex i2c_bus_lock; +#else + struct semaphore i2c_bus_lock; +#endif int i2c_state; struct i2c_client *i2c_clients[I2C_CLIENTS_MAX]; |