diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-07-31 21:05:44 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-06 15:39:51 +0200 |
| commit | ece11c9b6db5b96179df8eb9cdc54c78953a4c0f (patch) | |
| tree | 21c5ebf03d9750fc1c4a4551f84031e969e422b8 /sound/isa/cmi8330.c | |
| parent | 241b3ee70d2d69e88d5c144ce938b1887cd6d3fc (diff) | |
| download | kernel_samsung_smdk4412-ece11c9b6db5b96179df8eb9cdc54c78953a4c0f.tar.gz kernel_samsung_smdk4412-ece11c9b6db5b96179df8eb9cdc54c78953a4c0f.tar.bz2 kernel_samsung_smdk4412-ece11c9b6db5b96179df8eb9cdc54c78953a4c0f.zip | |
ALSA: wss_lib: use wss constants instead of ad1848 ones
Use wss constants for mode.
Move ad1848 hardware constants to the wss.h.
Move mixer tlv macros into the ad1848_lib.c from the ad1848.h.
Drop the MODE_RUNNING spurious IRQ guard on AD1848 as it doesn not seem
to be needed.
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/cmi8330.c')
| -rw-r--r-- | sound/isa/cmi8330.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index aefd2f4a057..af6ba129910 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -465,12 +465,12 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) wssport[dev] + 4, wssirq[dev], wssdma[dev], - AD1848_HW_DETECT, + WSS_HW_DETECT, &acard->wss)) < 0) { snd_printk(KERN_ERR PFX "(AD1848) device busy??\n"); return err; } - if (acard->wss->hardware != AD1848_HW_CMI8330) { + if (acard->wss->hardware != WSS_HW_CMI8330) { snd_printk(KERN_ERR PFX "(AD1848) not found during probe\n"); return -ENODEV; } |