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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
sungem.h
diff --git
a/drivers/net/sungem.h
b/drivers/net/sungem.h
index
8984721
..
13006d7
100644
(file)
--- a/
drivers/net/sungem.h
+++ b/
drivers/net/sungem.h
@@
-980,15
+980,15
@@
struct gem {
int tx_new, tx_old;
unsigned int has_wol : 1; /* chip supports wake-on-lan */
int tx_new, tx_old;
unsigned int has_wol : 1; /* chip supports wake-on-lan */
- unsigned int asleep : 1; /* chip asleep, protected by pm_
mutex
*/
+ unsigned int asleep : 1; /* chip asleep, protected by pm_
sem
*/
unsigned int asleep_wol : 1; /* was asleep with WOL enabled */
unsigned int asleep_wol : 1; /* was asleep with WOL enabled */
- unsigned int opened : 1; /* driver opened, protected by pm_
mutex
*/
+ unsigned int opened : 1; /* driver opened, protected by pm_
sem
*/
unsigned int running : 1; /* chip running, protected by lock */
/* cell enable count, protected by lock */
int cell_enabled;
unsigned int running : 1; /* chip running, protected by lock */
/* cell enable count, protected by lock */
int cell_enabled;
- struct
mutex pm_mutex
;
+ struct
semaphore pm_sem
;
u32 msg_enable;
u32 status;
u32 msg_enable;
u32 status;