diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-12 04:02:04 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-12 04:02:04 -0500 |
commit | 90d0be2fc33b4c4e11fc596da4736189be947d99 (patch) | |
tree | 0dd7e261f8d79d933c0a93c1a714b9a72fa05c28 /sound/pci/hda/patch_analog.c | |
parent | f43aa025b7de79d6a615ea4c1e6be7e6b1cea538 (diff) | |
parent | d7a8943635485597ae7c6d554a8ccf3ce5a42d2d (diff) |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index d0d66f341cda..032cbb4bd985 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -3859,6 +3859,8 @@ static const char *ad1884a_models[AD1884A_MODELS] = { | |||
3859 | static struct snd_pci_quirk ad1884a_cfg_tbl[] = { | 3859 | static struct snd_pci_quirk ad1884a_cfg_tbl[] = { |
3860 | SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE), | 3860 | SND_PCI_QUIRK(0x103c, 0x3030, "HP", AD1884A_MOBILE), |
3861 | SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), | 3861 | SND_PCI_QUIRK(0x103c, 0x3056, "HP", AD1884A_MOBILE), |
3862 | SND_PCI_QUIRK(0x103c, 0x30e7, "HP EliteBook 8530p", AD1884A_LAPTOP), | ||
3863 | SND_PCI_QUIRK(0x103c, 0x3614, "HP 6730s", AD1884A_LAPTOP), | ||
3862 | SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD), | 3864 | SND_PCI_QUIRK(0x17aa, 0x20ac, "Thinkpad X300", AD1884A_THINKPAD), |
3863 | {} | 3865 | {} |
3864 | }; | 3866 | }; |