git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
media
/
video
/
zoran.h
diff --git
a/drivers/media/video/zoran.h
b/drivers/media/video/zoran.h
index
9fe6ad3
..
0166f55
100644
(file)
--- a/
drivers/media/video/zoran.h
+++ b/
drivers/media/video/zoran.h
@@
-1,4
+1,4
@@
-/*
+/*
* zoran - Iomega Buz driver
*
* Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
* zoran - Iomega Buz driver
*
* Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
@@
-395,7
+395,7
@@
struct zoran {
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
struct videocodec *codec; /* video codec */
struct videocodec *vfe; /* video front end */
- struct
semaphore resource_lock;
/* prevent evil stuff */
+ struct
mutex resource_lock;
/* prevent evil stuff */
u8 initialized; /* flag if zoran has been correctly initalized */
int user; /* number of current users */
u8 initialized; /* flag if zoran has been correctly initalized */
int user; /* number of current users */