diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 08:36:40 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-08 08:36:40 -0700 |
commit | 31e918908ccaf2b651ed8f666120f2a03a97193f (patch) | |
tree | 39aab36ced1932d06cb2e3cee037faae0b94a63b /Documentation | |
parent | ae3759c2573031f1306496c6f9f32f20e86f03aa (diff) | |
parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
download | linux-stable-31e918908ccaf2b651ed8f666120f2a03a97193f.tar.gz linux-stable-31e918908ccaf2b651ed8f666120f2a03a97193f.tar.bz2 linux-stable-31e918908ccaf2b651ed8f666120f2a03a97193f.zip |
Merge 3.9-rc6 into usb-next
We want the fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 4499bd948860..95731a08f257 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -890,9 +890,8 @@ 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 - Support runtime D3 of HD-audio controller - (-1 = on for supported chip (default), false = off, - true = force to on even for unsupported hardware) + power_save_controller - Reset HD-audio controller in power-saving mode + (default = on) 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 |