Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / Documentation / sound / alsa / HD-Audio-Models.txt

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 03771d7..ce46fa1 100644 (file)
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -83,8 +83,8 @@ ALC269
 ======
   basic                Basic preset
   quanta       Quanta FL1
-  eeepc-p703   ASUS Eeepc P703 P900A
-  eeepc-p901   ASUS Eeepc P901 S101
+  laptop-amic  Laptops with analog-mic input
+  laptop-dmic  Laptops with digital-mic input
   fujitsu      FSC Amilo
   lifebook     Fujitsu Lifebook S6420
   auto         auto-config reading BIOS (default)
@@ -109,6 +109,8 @@ ALC662/663/272
   asus-mode4   ASUS
   asus-mode5   ASUS
   asus-mode6   ASUS
+  asus-mode7   ASUS
+  asus-mode8   ASUS
   dell         Dell with ALC272
   dell-zm1     Dell ZM1 with ALC272
   samsung-nc10 Samsung NC10 mini notebook
@@ -295,8 +297,10 @@ Conexant 5066
 =============
   laptop       Basic Laptop config (default)
   dell-laptop  Dell laptops
+  dell-vostro  Dell Vostro
   olpc-xo-1_5  OLPC XO 1.5
   ideapad       Lenovo IdeaPad U150
+  thinkpad     Lenovo Thinkpad
 
 STAC9200
 ========
@@ -404,6 +408,7 @@ STAC92HD83*
   mic-ref      Reference board with power management for ports
   dell-s14     Dell laptop
   hp           HP laptops with (inverted) mute-LED
+  hp-dv7-4000  HP dv-7 4000
   auto         BIOS setup (default)
 
 STAC9872
@@ -416,3 +421,7 @@ Cirrus Logic CS4206/4207
   mbp55                MacBook Pro 5,5
   imac27       IMac 27 Inch
   auto         BIOS setup (default)
+
+VIA VT17xx/VT18xx/VT20xx
+========================
+  auto         BIOS setup (default)