diff options
-rw-r--r-- | Documentation/sound/alsa/HD-Audio-Models.txt | 1 | ||||
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt index bda546928a42..c8c54544abc5 100644 --- a/Documentation/sound/alsa/HD-Audio-Models.txt +++ b/Documentation/sound/alsa/HD-Audio-Models.txt | |||
@@ -338,7 +338,6 @@ STAC92HD83* | |||
338 | mic-ref Reference board with power management for ports | 338 | mic-ref Reference board with power management for ports |
339 | dell-s14 Dell laptop | 339 | dell-s14 Dell laptop |
340 | dell-vostro-3500 Dell Vostro 3500 laptop | 340 | dell-vostro-3500 Dell Vostro 3500 laptop |
341 | hp HP laptops with (inverted) mute-LED | ||
342 | hp-dv7-4000 HP dv-7 4000 | 341 | hp-dv7-4000 HP dv-7 4000 |
343 | auto BIOS setup (default) | 342 | auto BIOS setup (default) |
344 | 343 | ||
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 85740e0849d5..65f517930991 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -96,7 +96,6 @@ enum { | |||
96 | STAC_92HD83XXX_PWR_REF, | 96 | STAC_92HD83XXX_PWR_REF, |
97 | STAC_DELL_S14, | 97 | STAC_DELL_S14, |
98 | STAC_DELL_VOSTRO_3500, | 98 | STAC_DELL_VOSTRO_3500, |
99 | STAC_92HD83XXX_HP, | ||
100 | STAC_92HD83XXX_HP_cNB11_INTQUAD, | 99 | STAC_92HD83XXX_HP_cNB11_INTQUAD, |
101 | STAC_HP_DV7_4000, | 100 | STAC_HP_DV7_4000, |
102 | STAC_92HD83XXX_MODELS | 101 | STAC_92HD83XXX_MODELS |
@@ -1692,7 +1691,6 @@ static const char * const stac92hd83xxx_models[STAC_92HD83XXX_MODELS] = { | |||
1692 | [STAC_92HD83XXX_PWR_REF] = "mic-ref", | 1691 | [STAC_92HD83XXX_PWR_REF] = "mic-ref", |
1693 | [STAC_DELL_S14] = "dell-s14", | 1692 | [STAC_DELL_S14] = "dell-s14", |
1694 | [STAC_DELL_VOSTRO_3500] = "dell-vostro-3500", | 1693 | [STAC_DELL_VOSTRO_3500] = "dell-vostro-3500", |
1695 | [STAC_92HD83XXX_HP] = "hp", | ||
1696 | [STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad", | 1694 | [STAC_92HD83XXX_HP_cNB11_INTQUAD] = "hp_cNB11_intquad", |
1697 | [STAC_HP_DV7_4000] = "hp-dv7-4000", | 1695 | [STAC_HP_DV7_4000] = "hp-dv7-4000", |
1698 | }; | 1696 | }; |
@@ -1707,8 +1705,6 @@ static const struct snd_pci_quirk stac92hd83xxx_cfg_tbl[] = { | |||
1707 | "unknown Dell", STAC_DELL_S14), | 1705 | "unknown Dell", STAC_DELL_S14), |
1708 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x1028, | 1706 | SND_PCI_QUIRK(PCI_VENDOR_ID_DELL, 0x1028, |
1709 | "Dell Vostro 3500", STAC_DELL_VOSTRO_3500), | 1707 | "Dell Vostro 3500", STAC_DELL_VOSTRO_3500), |
1710 | SND_PCI_QUIRK_MASK(PCI_VENDOR_ID_HP, 0xff00, 0x3600, | ||
1711 | "HP", STAC_92HD83XXX_HP), | ||
1712 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656, | 1708 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1656, |
1713 | "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD), | 1709 | "HP", STAC_92HD83XXX_HP_cNB11_INTQUAD), |
1714 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1657, | 1710 | SND_PCI_QUIRK(PCI_VENDOR_ID_HP, 0x1657, |