summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:43 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-10 07:26:43 +0200
commit4ad75433c2a8a2eab16b077456202815adc536f9 (patch)
treecbc67cd585f02446c4204b67712da6e2f108498d /sound
parent3b88bc522986ae853670fcba71bb3761c84f7867 (diff)
parent9a83b7453c2c4db145666b653abe9d9f410d18a2 (diff)
Merge branch 'topic/pcm-subclass-fix' into for-linus
* topic/pcm-subclass-fix: ALSA: Remove invalid GENERIC_MIX PCM sublass
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/ca0106/ca0106_main.c1
-rw-r--r--sound/pci/emu10k1/emu10k1x.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index bfac30f7929f..57b992a5c057 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1319,7 +1319,6 @@ static int __devinit snd_ca0106_pcm(struct snd_ca0106 *emu, int device)
}
pcm->info_flags = 0;
- pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
strcpy(pcm->name, "CA0106");
for(substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 1970f0e70f37..4d3ad793e98f 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -858,7 +858,6 @@ static int __devinit snd_emu10k1x_pcm(struct emu10k1x *emu, int device, struct s
}
pcm->info_flags = 0;
- pcm->dev_subclass = SNDRV_PCM_SUBCLASS_GENERIC_MIX;
switch(device) {
case 0:
strcpy(pcm->name, "EMU10K1X Front");