aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-09 11:33:27 -0500
committerTakashi Iwai <tiwai@suse.de>2011-11-09 11:57:52 -0500
commit25da1f86b4e7f5fef26cec1f65be3b120f2d36ac (patch)
treea4746d563c90331275ce198e07e442833f65a98a /sound
parentb3ca3bf5e8e0fb445a81aef02092ae0b11fa4482 (diff)
ALSA: hda/realtek - Drop ALC882 model=acer quirk
This quirk is anyway not used any more, so no problem to remove. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/alc882_quirks.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/sound/pci/hda/alc882_quirks.c b/sound/pci/hda/alc882_quirks.c
index 370b5a7b79b3..29c9b8a0a655 100644
--- a/sound/pci/hda/alc882_quirks.c
+++ b/sound/pci/hda/alc882_quirks.c
@@ -24,7 +24,6 @@ enum {
24 ALC883_TARGA_DIG, 24 ALC883_TARGA_DIG,
25 ALC883_TARGA_2ch_DIG, 25 ALC883_TARGA_2ch_DIG,
26 ALC883_TARGA_8ch_DIG, 26 ALC883_TARGA_8ch_DIG,
27 ALC883_ACER,
28 ALC883_ACER_ASPIRE, 27 ALC883_ACER_ASPIRE,
29 ALC888_ACER_ASPIRE_4930G, 28 ALC888_ACER_ASPIRE_4930G,
30 ALC888_ACER_ASPIRE_6530G, 29 ALC888_ACER_ASPIRE_6530G,
@@ -2089,7 +2088,6 @@ static const char * const alc882_models[ALC882_MODEL_LAST] = {
2089 [ALC883_TARGA_DIG] = "targa-dig", 2088 [ALC883_TARGA_DIG] = "targa-dig",
2090 [ALC883_TARGA_2ch_DIG] = "targa-2ch-dig", 2089 [ALC883_TARGA_2ch_DIG] = "targa-2ch-dig",
2091 [ALC883_TARGA_8ch_DIG] = "targa-8ch-dig", 2090 [ALC883_TARGA_8ch_DIG] = "targa-8ch-dig",
2092 [ALC883_ACER] = "acer",
2093 [ALC883_ACER_ASPIRE] = "acer-aspire", 2091 [ALC883_ACER_ASPIRE] = "acer-aspire",
2094 [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g", 2092 [ALC888_ACER_ASPIRE_4930G] = "acer-aspire-4930g",
2095 [ALC888_ACER_ASPIRE_6530G] = "acer-aspire-6530g", 2093 [ALC888_ACER_ASPIRE_6530G] = "acer-aspire-6530g",
@@ -2127,10 +2125,6 @@ static const struct snd_pci_quirk alc882_cfg_tbl[] = {
2127 ALC888_ACER_ASPIRE_6530G), 2125 ALC888_ACER_ASPIRE_6530G),
2128 SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G", 2126 SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",
2129 ALC888_ACER_ASPIRE_7730G), 2127 ALC888_ACER_ASPIRE_7730G),
2130 /* default Acer -- disabled as it causes more problems.
2131 * model=auto should work fine now
2132 */
2133 /* SND_PCI_QUIRK_VENDOR(0x1025, "Acer laptop", ALC883_ACER), */
2134 2128
2135 SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavilion", ALC883_6ST_DIG), 2129 SND_PCI_QUIRK(0x103c, 0x2a3d, "HP Pavilion", ALC883_6ST_DIG),
2136 SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG), 2130 SND_PCI_QUIRK(0x103c, 0x2a61, "HP Nettle", ALC883_6ST_DIG),
@@ -2524,20 +2518,6 @@ static const struct alc_config_preset alc882_presets[] = {
2524 .setup = alc882_targa_setup, 2518 .setup = alc882_targa_setup,
2525 .init_hook = alc882_targa_automute, 2519 .init_hook = alc882_targa_automute,
2526 }, 2520 },
2527 [ALC883_ACER] = {
2528 .mixers = { alc883_base_mixer },
2529 /* On TravelMate laptops, GPIO 0 enables the internal speaker
2530 * and the headphone jack. Turn this on and rely on the
2531 * standard mute methods whenever the user wants to turn
2532 * these outputs off.
2533 */
2534 .init_verbs = { alc883_init_verbs, alc880_gpio1_init_verbs },
2535 .num_dacs = ARRAY_SIZE(alc883_dac_nids),
2536 .dac_nids = alc883_dac_nids,
2537 .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes),
2538 .channel_mode = alc883_3ST_2ch_modes,
2539 .input_mux = &alc883_capture_source,
2540 },
2541 [ALC883_ACER_ASPIRE] = { 2521 [ALC883_ACER_ASPIRE] = {
2542 .mixers = { alc883_acer_aspire_mixer }, 2522 .mixers = { alc883_acer_aspire_mixer },
2543 .init_verbs = { alc883_init_verbs, alc883_acer_eapd_verbs }, 2523 .init_verbs = { alc883_init_verbs, alc883_acer_eapd_verbs },