Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / Documentation / sound / alsa / ALSA-Configuration.txt

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index b9cfd339a6fa3d4e89cebb3316e5152f9ff0d252..ce6581c8ca26915c1a00f31a9b7605c0cb6c3413 100644 (file)
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -890,8 +890,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     enable_msi - Enable Message Signaled Interrupt (MSI) (default = off)
     power_save - Automatic power-saving timeout (in second, 0 =
                disable)
-    power_save_controller - Reset HD-audio controller in power-saving mode
-               (default = on)
+    power_save_controller - Support runtime D3 of HD-audio controller
+               (-1 = on for supported chip (default), false = off,
+                true = force to on even for unsupported hardware)
     align_buffer_size - Force rounding of buffer/period sizes to multiples
                      of 128 bytes. This is more efficient in terms of memory
                      access but isn't required by the HDA spec and prevents