diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/net/cassini.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/net/cassini.h')
| -rw-r--r-- | drivers/net/cassini.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cassini.h b/drivers/net/cassini.h index 88063ef16cf6..ab55c7ee1012 100644 --- a/drivers/net/cassini.h +++ b/drivers/net/cassini.h | |||
| @@ -4284,7 +4284,7 @@ struct cas { | |||
| 4284 | * (ie. not power managed) */ | 4284 | * (ie. not power managed) */ |
| 4285 | int hw_running; | 4285 | int hw_running; |
| 4286 | int opened; | 4286 | int opened; |
| 4287 | struct semaphore pm_sem; /* open/close/suspend/resume */ | 4287 | struct mutex pm_mutex; /* open/close/suspend/resume */ |
| 4288 | 4288 | ||
| 4289 | struct cas_init_block *init_block; | 4289 | struct cas_init_block *init_block; |
| 4290 | struct cas_tx_desc *init_txds[MAX_TX_RINGS]; | 4290 | struct cas_tx_desc *init_txds[MAX_TX_RINGS]; |