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/ad1848.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/ad1848.h')
| -rw-r--r-- | include/sound/ad1848.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/ad1848.h b/include/sound/ad1848.h index 1a2759f3a292..57af1fe7b309 100644 --- a/include/sound/ad1848.h +++ b/include/sound/ad1848.h | |||
| @@ -154,7 +154,7 @@ struct snd_ad1848 { | |||
| 154 | #endif | 154 | #endif |
| 155 | 155 | ||
| 156 | spinlock_t reg_lock; | 156 | spinlock_t reg_lock; |
| 157 | struct semaphore open_mutex; | 157 | struct mutex open_mutex; |
| 158 | }; | 158 | }; |
| 159 | 159 | ||
| 160 | /* exported functions */ | 160 | /* exported functions */ |