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/soundfont.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/soundfont.h')
| -rw-r--r-- | include/sound/soundfont.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soundfont.h b/include/sound/soundfont.h index 61a010c65d02..f95d99ba7f74 100644 --- a/include/sound/soundfont.h +++ b/include/sound/soundfont.h | |||
| @@ -93,7 +93,7 @@ struct snd_sf_list { | |||
| 93 | int sample_locked; /* locked time for sample */ | 93 | int sample_locked; /* locked time for sample */ |
| 94 | struct snd_sf_callback callback; /* callback functions */ | 94 | struct snd_sf_callback callback; /* callback functions */ |
| 95 | int presets_locked; | 95 | int presets_locked; |
| 96 | struct semaphore presets_mutex; | 96 | struct mutex presets_mutex; |
| 97 | spinlock_t lock; | 97 | spinlock_t lock; |
| 98 | struct snd_util_memhdr *memhdr; | 98 | struct snd_util_memhdr *memhdr; |
| 99 | }; | 99 | }; |
