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 /sound/oss/emu10k1/hwaccess.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/oss/emu10k1/hwaccess.h')
| -rw-r--r-- | sound/oss/emu10k1/hwaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/emu10k1/hwaccess.h b/sound/oss/emu10k1/hwaccess.h index 104223a192aa..85e27bda694b 100644 --- a/sound/oss/emu10k1/hwaccess.h +++ b/sound/oss/emu10k1/hwaccess.h | |||
| @@ -181,7 +181,7 @@ struct emu10k1_card | |||
| 181 | struct emu10k1_mpuout *mpuout; | 181 | struct emu10k1_mpuout *mpuout; |
| 182 | struct emu10k1_mpuin *mpuin; | 182 | struct emu10k1_mpuin *mpuin; |
| 183 | 183 | ||
| 184 | struct semaphore open_sem; | 184 | struct mutex open_sem; |
| 185 | mode_t open_mode; | 185 | mode_t open_mode; |
| 186 | wait_queue_head_t open_wait; | 186 | wait_queue_head_t open_wait; |
| 187 | 187 | ||