remove the documentation for the legacy CDROM drivers

[linux-2.6-omap-h63xx.git] / Documentation / sound / alsa / ALSA-Configuration.txt

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 73e9a174b6427853b073bf4143e88e9f6e014a0f..355ff0a2bb7c5a1cdc9862c4f827e9e49497c165 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -821,6 +821,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          6stack-dig    6-jack digital with SPDIF I/O
          arima         Arima W820Di1
          macpro        MacPro support
+         w2jc          ASUS W2JC
          auto          auto-config reading BIOS (default)
 
        ALC883/888
@@ -852,6 +853,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          3stack-dig    3-jack with SPDIF OUT
          6stack-dig    6-jack with SPDIF OUT
          3stack-660    3-jack (for ALC660VD)
+         lenovo        Lenovo 3000 C200
          auto          auto-config reading BIOS (default)
 
        CMI9880
@@ -909,11 +911,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          macbook       Intel Mac Book
          macbook-pro-v1 Intel Mac Book Pro 1st generation
          macbook-pro   Intel Mac Book Pro 2nd generation
+         imac-intel    Intel iMac
 
        STAC9202/9250/9251
          ref           Reference board, base config
          m2-2          Some Gateway MX series laptops
          m6            Some Gateway NX series laptops
+         pa6           Gateway NX860 series
 
        STAC9227/9228/9229/927x
          ref           Reference board
@@ -924,6 +928,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
          vaio          Setup for VAIO FE550G/SZ110
          vaio-ar Setup for VAIO AR
 
+    The model name "genric" is treated as a special case.  When this
+    model is given, the driver uses the generic codec parser without
+    "codec-patch".  It's sometimes good for testing and debugging.
+
     If the default configuration doesn't work and one of the above
     matches with your device, report it together with the PCI
     subsystem ID (output of "lspci -nv") to ALSA BTS or alsa-devel
@@ -1278,6 +1286,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     port       - port number or -1 (disable)
     irq                - IRQ number or -1 (disable)
     pnp                - PnP detection - 0 = disable, 1 = enable (default)
+    uart_enter - Issue UART_ENTER command at open - bool, default = on
 
     This module supports multiple devices and PnP.
     
@@ -1692,6 +1701,17 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     This module supports multiple devices, autoprobe and hotplugging.
 
+  Module snd-usb-caiaq
+  --------------------
+
+    Module for caiaq UB audio interfaces,
+           * Native Instruments RigKontrol2
+           * Native Instruments Kore Controller
+           * Native Instruments Audio Kontrol 1
+           * Native Instruments Audio 8 DJ
+
+    This module supports multiple devices, autoprobe and hotplugging.
+
   Module snd-usb-usx2y
   --------------------
 
@@ -2046,4 +2066,4 @@ Links and Addresses
        https://bugtrack.alsa-project.org/bugs/
 
   ALSA Developers ML
-       mailto:alsa-devel@lists.sourceforge.net
+       mailto:alsa-devel@alsa-project.org