summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/cx88/cx88.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88.h')
-rw-r--r--linux/drivers/media/video/cx88/cx88.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index a6a1e2a60..e9300a2bc 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -39,6 +39,9 @@
#include "cx88-reg.h"
#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+#include <linux/mutex.h>
+#endif
#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)
#ifndef TRUE
@@ -319,8 +322,11 @@ struct cx88_core {
/* IR remote control state */
struct cx88_IR *ir;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
+ struct mutex lock;
+#else
struct semaphore lock;
-
+#endif
/* various v4l controls */
u32 freq;