Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[sfrench/cifs-2.6.git] / Documentation / sound / alsa / ALSA-Configuration.txt

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 79a44f5a570a2c5f398dcfdb363792abc53e7ec0..c30ff1bb2d1019aedfb8d96d97cd248b9e711b93 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -785,6 +785,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          asus-dig      ASUS with SPDIF out
          asus-dig2     ASUS with SPDIF out (using GPIO2)
          uniwill       3-jack
+         fujitsu       Fujitsu Laptops (Pi1536)
          F1734         2-jack
          lg            LG laptop (m1 express dual)
          lg-lw         LG LW20/LW25 laptop
@@ -806,6 +807,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
        ALC262
          fujitsu       Fujitsu Laptop
          hp-bpc        HP xw4400/6400/8400/9400 laptops
+         hp-bpc-d7000  HP BPC D7000
          benq          Benq ED8
          hippo         Hippo (ATI) with jack detection, Sony UX-90s
          hippo_1       Hippo (Benq) with jack detection
@@ -843,6 +845,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          asus-laptop   ASUS F2/F3 laptops
          auto          auto-config reading BIOS (default)
 
+       ALC861VD/660VD
+         3stack        3-jack
+         3stack-dig    3-jack with SPDIF OUT
+         6stack-dig    6-jack with SPDIF OUT
+         3stack-660    3-jack (for ALC660VD)
+         auto          auto-config reading BIOS (default)
+
        CMI9880
          minimal       3-jack in back
          min_fp        3-jack in back, 2-jack in front