diff options
Diffstat (limited to 'include/sound/emu10k1.h')
| -rw-r--r-- | include/sound/emu10k1.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index 951e40d720d9..186e00ad9e79 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <sound/pcm-indirect.h> | 33 | #include <sound/pcm-indirect.h> |
| 34 | #include <sound/timer.h> | 34 | #include <sound/timer.h> |
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/mutex.h> | ||
| 36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 37 | 38 | ||
| 38 | /* ------------------- DEFINES -------------------- */ | 39 | /* ------------------- DEFINES -------------------- */ |
| @@ -1022,7 +1023,7 @@ struct snd_emu10k1_fx8010 { | |||
| 1022 | int gpr_size; /* size of allocated GPR controls */ | 1023 | int gpr_size; /* size of allocated GPR controls */ |
| 1023 | int gpr_count; /* count of used kcontrols */ | 1024 | int gpr_count; /* count of used kcontrols */ |
| 1024 | struct list_head gpr_ctl; /* GPR controls */ | 1025 | struct list_head gpr_ctl; /* GPR controls */ |
| 1025 | struct semaphore lock; | 1026 | struct mutex lock; |
| 1026 | struct snd_emu10k1_fx8010_pcm pcm[8]; | 1027 | struct snd_emu10k1_fx8010_pcm pcm[8]; |
| 1027 | spinlock_t irq_lock; | 1028 | spinlock_t irq_lock; |
| 1028 | struct snd_emu10k1_fx8010_irq *irq_handlers; | 1029 | struct snd_emu10k1_fx8010_irq *irq_handlers; |
| @@ -1122,7 +1123,6 @@ struct snd_emu10k1 { | |||
| 1122 | spinlock_t reg_lock; | 1123 | spinlock_t reg_lock; |
| 1123 | spinlock_t emu_lock; | 1124 | spinlock_t emu_lock; |
| 1124 | spinlock_t voice_lock; | 1125 | spinlock_t voice_lock; |
| 1125 | struct semaphore ptb_lock; | ||
| 1126 | 1126 | ||
| 1127 | struct snd_emu10k1_voice voices[NUM_G]; | 1127 | struct snd_emu10k1_voice voices[NUM_G]; |
| 1128 | struct snd_emu10k1_voice p16v_voices[4]; | 1128 | struct snd_emu10k1_voice p16v_voices[4]; |
