diff options
Diffstat (limited to 'sound/isa/cs423x/cs4236.c')
-rw-r--r-- | sound/isa/cs423x/cs4236.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c index d60a55e6a0b1..a28f24c4f027 100644 --- a/sound/isa/cs423x/cs4236.c +++ b/sound/isa/cs423x/cs4236.c | |||
@@ -131,7 +131,7 @@ struct snd_card_cs4236 { | |||
131 | #endif | 131 | #endif |
132 | }; | 132 | }; |
133 | 133 | ||
134 | static snd_card_t *snd_cs4236_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; | 134 | static struct snd_card *snd_cs4236_legacy[SNDRV_CARDS] = SNDRV_DEFAULT_PTR; |
135 | 135 | ||
136 | #ifdef CONFIG_PNP | 136 | #ifdef CONFIG_PNP |
137 | 137 | ||
@@ -375,7 +375,7 @@ static int __devinit snd_card_cs4236_pnp(int dev, struct snd_card_cs4236 *acard, | |||
375 | } | 375 | } |
376 | #endif /* CONFIG_PNP */ | 376 | #endif /* CONFIG_PNP */ |
377 | 377 | ||
378 | static void snd_card_cs4236_free(snd_card_t *card) | 378 | static void snd_card_cs4236_free(struct snd_card *card) |
379 | { | 379 | { |
380 | struct snd_card_cs4236 *acard = (struct snd_card_cs4236 *)card->private_data; | 380 | struct snd_card_cs4236 *acard = (struct snd_card_cs4236 *)card->private_data; |
381 | 381 | ||
@@ -392,11 +392,11 @@ static void snd_card_cs4236_free(snd_card_t *card) | |||
392 | static int __devinit snd_card_cs423x_probe(int dev, struct pnp_card_link *pcard, | 392 | static int __devinit snd_card_cs423x_probe(int dev, struct pnp_card_link *pcard, |
393 | const struct pnp_card_device_id *pid) | 393 | const struct pnp_card_device_id *pid) |
394 | { | 394 | { |
395 | snd_card_t *card; | 395 | struct snd_card *card; |
396 | struct snd_card_cs4236 *acard; | 396 | struct snd_card_cs4236 *acard; |
397 | snd_pcm_t *pcm = NULL; | 397 | struct snd_pcm *pcm = NULL; |
398 | cs4231_t *chip; | 398 | struct snd_cs4231 *chip; |
399 | opl3_t *opl3; | 399 | struct snd_opl3 *opl3; |
400 | int err; | 400 | int err; |
401 | 401 | ||
402 | if (! is_isapnp_selected(dev)) { | 402 | if (! is_isapnp_selected(dev)) { |
@@ -538,7 +538,7 @@ static int __devinit snd_cs423x_pnp_detect(struct pnp_card_link *card, | |||
538 | 538 | ||
539 | static void __devexit snd_cs423x_pnp_remove(struct pnp_card_link * pcard) | 539 | static void __devexit snd_cs423x_pnp_remove(struct pnp_card_link * pcard) |
540 | { | 540 | { |
541 | snd_card_t *card = (snd_card_t *) pnp_get_card_drvdata(pcard); | 541 | struct snd_card *card = (struct snd_card *) pnp_get_card_drvdata(pcard); |
542 | 542 | ||
543 | snd_card_disconnect(card); | 543 | snd_card_disconnect(card); |
544 | snd_card_free_in_thread(card); | 544 | snd_card_free_in_thread(card); |