diff options
Diffstat (limited to 'sound/pci/emu10k1/emu10k1.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index 78270f8710ff..9be900224771 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -101,10 +101,10 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci, | |||
101 | const struct pci_device_id *pci_id) | 101 | const struct pci_device_id *pci_id) |
102 | { | 102 | { |
103 | static int dev; | 103 | static int dev; |
104 | snd_card_t *card; | 104 | struct snd_card *card; |
105 | emu10k1_t *emu; | 105 | struct snd_emu10k1 *emu; |
106 | #ifdef ENABLE_SYNTH | 106 | #ifdef ENABLE_SYNTH |
107 | snd_seq_device_t *wave = NULL; | 107 | struct snd_seq_device *wave = NULL; |
108 | #endif | 108 | #endif |
109 | int err; | 109 | int err; |
110 | 110 | ||
@@ -186,11 +186,11 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci, | |||
186 | } | 186 | } |
187 | #ifdef ENABLE_SYNTH | 187 | #ifdef ENABLE_SYNTH |
188 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, | 188 | if (snd_seq_device_new(card, 1, SNDRV_SEQ_DEV_ID_EMU10K1_SYNTH, |
189 | sizeof(snd_emu10k1_synth_arg_t), &wave) < 0 || | 189 | sizeof(struct snd_emu10k1_synth_arg), &wave) < 0 || |
190 | wave == NULL) { | 190 | wave == NULL) { |
191 | snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n"); | 191 | snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n"); |
192 | } else { | 192 | } else { |
193 | snd_emu10k1_synth_arg_t *arg; | 193 | struct snd_emu10k1_synth_arg *arg; |
194 | arg = SNDRV_SEQ_DEVICE_ARGPTR(wave); | 194 | arg = SNDRV_SEQ_DEVICE_ARGPTR(wave); |
195 | strcpy(wave->name, "Emu-10k1 Synth"); | 195 | strcpy(wave->name, "Emu-10k1 Synth"); |
196 | arg->hwptr = emu; | 196 | arg->hwptr = emu; |