summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran.h
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/zoran.h')
-rw-r--r--linux/drivers/media/video/zoran.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/linux/drivers/media/video/zoran.h b/linux/drivers/media/video/zoran.h
index 0166f555a..0dc51a46c 100644
--- a/linux/drivers/media/video/zoran.h
+++ b/linux/drivers/media/video/zoran.h
@@ -395,7 +395,11 @@ struct zoran {
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex resource_lock; /* prevent evil stuff */
+#else
+ struct semaphore resource_lock; /* prevent evil stuff */
+#endif
u8 initialized; /* flag if zoran has been correctly initalized */
int user; /* number of current users */