diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-11-23 17:08:42 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-11-23 17:08:42 +0100 |
| commit | b37c0096b448d099d304bb47c4eada9117dba4cf (patch) | |
| tree | c38f4c41874967a8f187e4c972b6365fb7a9f7cf /sound/pci/hda/patch_sigmatel.c | |
| parent | 8b940fc457fbf883053caf397586a61bd3cae23e (diff) | |
| parent | 61071594f64ed12328046f94716d1d744bddc0a1 (diff) | |
| download | op-kernel-dev-b37c0096b448d099d304bb47c4eada9117dba4cf.zip op-kernel-dev-b37c0096b448d099d304bb47c4eada9117dba4cf.tar.gz | |
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, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 470f6f2..f365865 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -1641,6 +1641,8 @@ static const struct snd_pci_quirk stac92hd73xx_codec_id_cfg_tbl[] = { "Alienware M17x", STAC_ALIENWARE_M17X), SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x043a, "Alienware M17x", STAC_ALIENWARE_M17X), + SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x0490, + "Alienware M17x", STAC_ALIENWARE_M17X), {} /* terminator */ }; |
