diff options
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/et61x251/et61x251.h | 6 | ||||
| -rw-r--r-- | linux/drivers/media/video/zc0301/zc0301.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/linux/drivers/media/video/et61x251/et61x251.h b/linux/drivers/media/video/et61x251/et61x251.h index 3ac2f508e..c5ac67528 100644 --- a/linux/drivers/media/video/et61x251/et61x251.h +++ b/linux/drivers/media/video/et61x251/et61x251.h @@ -34,7 +34,9 @@ #include <linux/types.h> #include <linux/param.h> #include <linux/rwsem.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> +#endif #include <linux/stddef.h> #include <linux/string.h> @@ -162,7 +164,11 @@ struct et61x251_device { enum et61x251_dev_state state; u8 users; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex dev_mutex, fileop_mutex; +#else + struct semaphore dev_mutex, fileop_mutex; +#endif spinlock_t queue_lock; wait_queue_head_t open, wait_frame, wait_stream; }; diff --git a/linux/drivers/media/video/zc0301/zc0301.h b/linux/drivers/media/video/zc0301/zc0301.h index 6959c980a..5bd8a8eba 100644 --- a/linux/drivers/media/video/zc0301/zc0301.h +++ b/linux/drivers/media/video/zc0301/zc0301.h @@ -33,7 +33,9 @@ #include <linux/wait.h> #include <linux/types.h> #include <linux/param.h> +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include <linux/mutex.h> +#endif #include <linux/rwsem.h> #include <linux/stddef.h> #include <linux/string.h> @@ -125,7 +127,11 @@ struct zc0301_device { enum zc0301_dev_state state; u8 users; +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) struct mutex dev_mutex, fileop_mutex; +#else + struct semaphore dev_mutex, fileop_mutex; +#endif spinlock_t queue_lock; wait_queue_head_t open, wait_frame, wait_stream; }; |