diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-10 07:26:43 +0200 |
| commit | 4ad75433c2a8a2eab16b077456202815adc536f9 (patch) | |
| tree | cbc67cd585f02446c4204b67712da6e2f108498d /sound/pci/emu10k1 | |
| parent | 3b88bc522986ae853670fcba71bb3761c84f7867 (diff) | |
| parent | 9a83b7453c2c4db145666b653abe9d9f410d18a2 (diff) | |
| download | talos-obmc-linux-4ad75433c2a8a2eab16b077456202815adc536f9.tar.gz talos-obmc-linux-4ad75433c2a8a2eab16b077456202815adc536f9.zip | |
Merge branch 'topic/pcm-subclass-fix' into for-linus
* topic/pcm-subclass-fix:
ALSA: Remove invalid GENERIC_MIX PCM sublass
Diffstat (limited to 'sound/pci/emu10k1')
| -rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 1 |
1 files changed, 0 insertions, 1 deletions
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"); |
