diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-27 11:47:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-27 11:47:31 -0500 |
| commit | f897497673ffd2895778d85df38a5071434309b4 (patch) | |
| tree | 5c7431ab4d7f31d99756459494f3ab4dc8752078 /sound/pci/hda/patch_sigmatel.c | |
| parent | bedfcebb4fb33fc9ebd395462e72afa103db0bec (diff) | |
| parent | bb543c969467f33c3a1a0ccfcfcd9a508cd81c54 (diff) | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 37ffd96a9ff2..13056429aa64 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
| @@ -5066,7 +5066,7 @@ again: | |||
| 5066 | case STAC_DELL_M4_3: | 5066 | case STAC_DELL_M4_3: |
| 5067 | spec->num_dmics = 1; | 5067 | spec->num_dmics = 1; |
| 5068 | spec->num_smuxes = 0; | 5068 | spec->num_smuxes = 0; |
| 5069 | spec->num_dmuxes = 0; | 5069 | spec->num_dmuxes = 1; |
| 5070 | break; | 5070 | break; |
| 5071 | case STAC_HP_DV5: | 5071 | case STAC_HP_DV5: |
| 5072 | snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); | 5072 | snd_hda_codec_set_pincfg(codec, 0x0d, 0x90170010); |