aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb/sb16.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/sb/sb16.c')
-rw-r--r--sound/isa/sb/sb16.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index c2fa451bc8f0..96e401333437 100644
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -138,7 +138,7 @@ struct snd_card_sb16 {
138#endif 138#endif
139}; 139};
140 140
141static snd_card_t *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; 141static struct snd_card *snd_sb16_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
142 142
143#ifdef CONFIG_PNP 143#ifdef CONFIG_PNP
144 144
@@ -339,7 +339,7 @@ __wt_error:
339 339
340#endif /* CONFIG_PNP */ 340#endif /* CONFIG_PNP */
341 341
342static void snd_sb16_free(snd_card_t *card) 342static void snd_sb16_free(struct snd_card *card)
343{ 343{
344 struct snd_card_sb16 *acard = (struct snd_card_sb16 *)card->private_data; 344 struct snd_card_sb16 *acard = (struct snd_card_sb16 *)card->private_data;
345 345
@@ -362,13 +362,13 @@ static int __init snd_sb16_probe(int dev,
362 static int possible_dmas8[] = {1, 3, 0, -1}; 362 static int possible_dmas8[] = {1, 3, 0, -1};
363 static int possible_dmas16[] = {5, 6, 7, -1}; 363 static int possible_dmas16[] = {5, 6, 7, -1};
364 int xirq, xdma8, xdma16; 364 int xirq, xdma8, xdma16;
365 sb_t *chip; 365 struct snd_sb *chip;
366 snd_card_t *card; 366 struct snd_card *card;
367 struct snd_card_sb16 *acard; 367 struct snd_card_sb16 *acard;
368 opl3_t *opl3; 368 struct snd_opl3 *opl3;
369 snd_hwdep_t *synth = NULL; 369 struct snd_hwdep *synth = NULL;
370#ifdef CONFIG_SND_SB16_CSP 370#ifdef CONFIG_SND_SB16_CSP
371 snd_hwdep_t *xcsp = NULL; 371 struct snd_hwdep *xcsp = NULL;
372#endif 372#endif
373 unsigned long flags; 373 unsigned long flags;
374 int err; 374 int err;
@@ -583,7 +583,7 @@ static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *card,
583 583
584static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard) 584static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard)
585{ 585{
586 snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); 586 struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard);
587 587
588 snd_card_disconnect(card); 588 snd_card_disconnect(card);
589 snd_card_free_in_thread(card); 589 snd_card_free_in_thread(card);