From 8c40b0843444af46d530817a6670e111f9231a53 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Sat, 15 Jul 2006 09:31:19 -0300 Subject: Add some mutex to semaphore backward compatability changes From: Trent Piepho Standard back compatability changes, for struct mutex added after 2.6.15. Signed-off-by: Trent Piepho --- linux/drivers/media/video/et61x251/et61x251.h | 6 ++++++ linux/drivers/media/video/zc0301/zc0301.h | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'linux/drivers') 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 #include #include +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include +#endif #include #include @@ -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 #include #include +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include +#endif #include #include #include @@ -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; }; -- cgit v1.2.3