summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/zoran/zoran.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/zoran/zoran.h')
-rw-r--r--drivers/media/video/zoran/zoran.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 1f04438695dd..b336259ce20c 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -388,6 +388,7 @@ struct zoran {
struct videocodec *vfe; /* video front end */
struct mutex resource_lock; /* prevent evil stuff */
+ struct mutex other_lock; /* please merge with above */
u8 initialized; /* flag if zoran has been correctly initialized */
int user; /* number of current users */