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_queue.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'sound/core/seq/seq_queue.h')
| -rw-r--r-- | sound/core/seq/seq_queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/seq/seq_queue.h b/sound/core/seq/seq_queue.h index 888438599387..30c8111477f6 100644 --- a/sound/core/seq/seq_queue.h +++ b/sound/core/seq/seq_queue.h | |||
| @@ -54,7 +54,7 @@ struct snd_seq_queue { | |||
| 54 | /* clients which uses this queue (bitmap) */ | 54 | /* clients which uses this queue (bitmap) */ |
| 55 | DECLARE_BITMAP(clients_bitmap, SNDRV_SEQ_MAX_CLIENTS); | 55 | DECLARE_BITMAP(clients_bitmap, SNDRV_SEQ_MAX_CLIENTS); |
| 56 | unsigned int clients; /* users of this queue */ | 56 | unsigned int clients; /* users of this queue */ |
| 57 | struct semaphore timer_mutex; | 57 | struct mutex timer_mutex; |
| 58 | 58 | ||
| 59 | snd_use_lock_t use_lock; | 59 | snd_use_lock_t use_lock; |
| 60 | }; | 60 | }; |