diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-31 15:04:37 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 09:39:50 -0400 |
commit | 241b3ee70d2d69e88d5c144ce938b1887cd6d3fc (patch) | |
tree | bbd54781110f2e5ff73afaa25fdd5e11e832c669 /sound/isa/sc6000.c | |
parent | 7779f75f072784d3fccf721b8ec43107f93619a0 (diff) |
ALSA: wss_lib: use struct snd_wss instead of snd_ad1848
The snd_wss is superset of the snd_ad1848 so kill
the latter and replace it with the snd_wss.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reviewed-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/isa/sc6000.c')
-rw-r--r-- | sound/isa/sc6000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/sc6000.c b/sound/isa/sc6000.c index da3d152bcad4..1771f15d6d3c 100644 --- a/sound/isa/sc6000.c +++ b/sound/isa/sc6000.c | |||
@@ -397,7 +397,7 @@ static int __devinit sc6000_init_board(char __iomem *vport, int irq, int dma, | |||
397 | return 0; | 397 | return 0; |
398 | } | 398 | } |
399 | 399 | ||
400 | static int __devinit snd_sc6000_mixer(struct snd_ad1848 *chip) | 400 | static int __devinit snd_sc6000_mixer(struct snd_wss *chip) |
401 | { | 401 | { |
402 | struct snd_card *card = chip->card; | 402 | struct snd_card *card = chip->card; |
403 | struct snd_ctl_elem_id id1, id2; | 403 | struct snd_ctl_elem_id id1, id2; |
@@ -483,7 +483,7 @@ static int __devinit snd_sc6000_probe(struct device *devptr, unsigned int dev) | |||
483 | int xirq = irq[dev]; | 483 | int xirq = irq[dev]; |
484 | int xdma = dma[dev]; | 484 | int xdma = dma[dev]; |
485 | struct snd_card *card; | 485 | struct snd_card *card; |
486 | struct snd_ad1848 *chip; | 486 | struct snd_wss *chip; |
487 | struct snd_opl3 *opl3; | 487 | struct snd_opl3 *opl3; |
488 | char __iomem *vport; | 488 | char __iomem *vport; |
489 | char __iomem *vmss_port; | 489 | char __iomem *vmss_port; |