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/core/seq/seq_clientmgr.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/core/seq/seq_clientmgr.h')
| -rw-r--r-- | sound/core/seq/seq_clientmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_clientmgr.h b/sound/core/seq/seq_clientmgr.h index 450091ca153d..5e04e20e239f 100644 --- a/sound/core/seq/seq_clientmgr.h +++ b/sound/core/seq/seq_clientmgr.h | |||
| @@ -58,7 +58,7 @@ struct snd_seq_client { | |||
| 58 | int num_ports; /* number of ports */ | 58 | int num_ports; /* number of ports */ |
| 59 | struct list_head ports_list_head; | 59 | struct list_head ports_list_head; |
| 60 | rwlock_t ports_lock; | 60 | rwlock_t ports_lock; |
| 61 | struct semaphore ports_mutex; | 61 | struct mutex ports_mutex; |
| 62 | int convert32; /* convert 32->64bit */ | 62 | int convert32; /* convert 32->64bit */ |
| 63 | 63 | ||
| 64 | /* output pool */ | 64 | /* output pool */ |