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/gus.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/sound/gus.h')
| -rw-r--r-- | include/sound/gus.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sound/gus.h b/include/sound/gus.h index 63da50fae773..68a664ab97f3 100644 --- a/include/sound/gus.h +++ b/include/sound/gus.h | |||
| @@ -209,7 +209,7 @@ struct snd_gf1_mem { | |||
| 209 | struct snd_gf1_bank_info banks_16[4]; | 209 | struct snd_gf1_bank_info banks_16[4]; |
| 210 | struct snd_gf1_mem_block *first; | 210 | struct snd_gf1_mem_block *first; |
| 211 | struct snd_gf1_mem_block *last; | 211 | struct snd_gf1_mem_block *last; |
| 212 | struct semaphore memory_mutex; | 212 | struct mutex memory_mutex; |
| 213 | }; | 213 | }; |
| 214 | 214 | ||
| 215 | struct snd_gf1_dma_block { | 215 | struct snd_gf1_dma_block { |
| @@ -467,8 +467,8 @@ struct snd_gus_card { | |||
| 467 | spinlock_t dma_lock; | 467 | spinlock_t dma_lock; |
| 468 | spinlock_t pcm_volume_level_lock; | 468 | spinlock_t pcm_volume_level_lock; |
| 469 | spinlock_t uart_cmd_lock; | 469 | spinlock_t uart_cmd_lock; |
| 470 | struct semaphore dma_mutex; | 470 | struct mutex dma_mutex; |
| 471 | struct semaphore register_mutex; | 471 | struct mutex register_mutex; |
| 472 | }; | 472 | }; |
| 473 | 473 | ||
| 474 | /* I/O functions for GF1/InterWave chip - gus_io.c */ | 474 | /* I/O functions for GF1/InterWave chip - gus_io.c */ |