aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt4
-rw-r--r--sound/pci/hda/patch_realtek.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 2bdabe23bc70..7f14eb961622 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -832,6 +832,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
832 832
833 ALC268 833 ALC268
834 3stack 3-stack model 834 3stack 3-stack model
835 toshiba Toshiba A205
835 auto auto-config reading BIOS (default) 836 auto auto-config reading BIOS (default)
836 837
837 ALC662 838 ALC662
@@ -858,7 +859,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
858 3stack-6ch-dig 3-jack 6-channel with SPDIF I/O 859 3stack-6ch-dig 3-jack 6-channel with SPDIF I/O
859 6stack-dig-demo 6-jack digital for Intel demo board 860 6stack-dig-demo 6-jack digital for Intel demo board
860 acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc) 861 acer Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)
861 acer-aspire Acer Aspire laptop 862 acer-aspire Acer Aspire 9810
862 medion Medion Laptops 863 medion Medion Laptops
863 medion-md2 Medion MD2 864 medion-md2 Medion MD2
864 targa-dig Targa/MSI 865 targa-dig Targa/MSI
@@ -890,6 +891,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
890 3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD) 891 3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
891 lenovo Lenovo 3000 C200 892 lenovo Lenovo 3000 C200
892 dallas Dallas laptops 893 dallas Dallas laptops
894 hp HP TX1000
893 auto auto-config reading BIOS (default) 895 auto auto-config reading BIOS (default)
894 896
895 CMI9880 897 CMI9880
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 3a0288143109..a6fcfbce0c0e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8618,6 +8618,7 @@ static void alc268_auto_init(struct hda_codec *codec)
8618 */ 8618 */
8619static const char *alc268_models[ALC268_MODEL_LAST] = { 8619static const char *alc268_models[ALC268_MODEL_LAST] = {
8620 [ALC268_3ST] = "3stack", 8620 [ALC268_3ST] = "3stack",
8621 [ALC268_TOSHIBA] = "toshiba",
8621 [ALC268_AUTO] = "auto", 8622 [ALC268_AUTO] = "auto",
8622}; 8623};
8623 8624
@@ -10427,12 +10428,13 @@ static void alc861vd_dallas_unsol_event(struct hda_codec *codec, unsigned int re
10427 */ 10428 */
10428static const char *alc861vd_models[ALC861VD_MODEL_LAST] = { 10429static const char *alc861vd_models[ALC861VD_MODEL_LAST] = {
10429 [ALC660VD_3ST] = "3stack-660", 10430 [ALC660VD_3ST] = "3stack-660",
10430 [ALC660VD_3ST_DIG]= "3stack-660-digout", 10431 [ALC660VD_3ST_DIG] = "3stack-660-digout",
10431 [ALC861VD_3ST] = "3stack", 10432 [ALC861VD_3ST] = "3stack",
10432 [ALC861VD_3ST_DIG] = "3stack-digout", 10433 [ALC861VD_3ST_DIG] = "3stack-digout",
10433 [ALC861VD_6ST_DIG] = "6stack-digout", 10434 [ALC861VD_6ST_DIG] = "6stack-digout",
10434 [ALC861VD_LENOVO] = "lenovo", 10435 [ALC861VD_LENOVO] = "lenovo",
10435 [ALC861VD_DALLAS] = "dallas", 10436 [ALC861VD_DALLAS] = "dallas",
10437 [ALC861VD_HP] = "hp",
10436 [ALC861VD_AUTO] = "auto", 10438 [ALC861VD_AUTO] = "auto",
10437}; 10439};
10438 10440