Merge branch 'fix/hda' into topic/hda

Conflicts:
	sound/pci/hda/patch_realtek.c
This commit is contained in:
Takashi Iwai
2009-02-27 17:47:31 +01:00
2 changed files with 2 additions and 1 deletions

View File

@@ -5066,7 +5066,7 @@ again:
case STAC_DELL_M4_3:
spec->num_dmics = 1;
spec->num_smuxes = 0;
spec->num_dmuxes = 0;
spec->num_dmuxes = 1;
break;
case STAC_HP_DV5:
snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010);