aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/opti9xx/opti92x-ad1848.c
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-07-31 21:04:37 +0200
committerJaroslav Kysela <perex@perex.cz>2008-08-06 15:39:50 +0200
commit241b3ee70d2d69e88d5c144ce938b1887cd6d3fc (patch)
treebbd54781110f2e5ff73afaa25fdd5e11e832c669 /sound/isa/opti9xx/opti92x-ad1848.c
parentALSA: wss_lib: rename cs4321_foo to wss_foo (diff)
downloadlinux-dev-241b3ee70d2d69e88d5c144ce938b1887cd6d3fc.tar.xz
linux-dev-241b3ee70d2d69e88d5c144ce938b1887cd6d3fc.zip
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 '')
-rw-r--r--sound/isa/opti9xx/opti92x-ad1848.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c
index fefb8597717c..ff9baf751b22 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -706,14 +706,10 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card)
static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
int error;
struct snd_opti9xx *chip = card->private_data;
-#if defined(CS4231) || defined(OPTi93X)
struct snd_wss *codec;
#ifdef CS4231
struct snd_timer *timer;
#endif
-#else
- struct snd_ad1848 *codec;
-#endif
struct snd_pcm *pcm;
struct snd_rawmidi *rmidi;
struct snd_hwdep *synth;