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 /include/sound/seq_instr.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/seq_instr.h')
| -rw-r--r-- | include/sound/seq_instr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/seq_instr.h b/include/sound/seq_instr.h index db764f09efb7..f2db03bfd74e 100644 --- a/include/sound/seq_instr.h +++ b/include/sound/seq_instr.h | |||
| @@ -64,7 +64,7 @@ struct snd_seq_kinstr_list { | |||
| 64 | 64 | ||
| 65 | spinlock_t lock; | 65 | spinlock_t lock; |
| 66 | spinlock_t ops_lock; | 66 | spinlock_t ops_lock; |
| 67 | struct semaphore ops_mutex; | 67 | struct mutex ops_mutex; |
| 68 | unsigned long ops_flags; | 68 | unsigned long ops_flags; |
| 69 | }; | 69 | }; |
| 70 | 70 | ||