aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-04 10:22:45 -0500
committerTakashi Iwai <tiwai@suse.de>2009-12-04 10:22:45 -0500
commit86e1d57e4f24ca27ce813bdc2afaac4adafcbaf4 (patch)
tree22b4797bfec25faa93a1166ea4ad39932536ee0d /Documentation
parentbaf9226667734579e344f612ed39f727079cad51 (diff)
parentac2c92e0cd06387ecee8115f5fa385fba6413c42 (diff)
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt3
-rw-r--r--Documentation/sound/alsa/HD-Audio-Models.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 50a59860ceed..8923597bd2bd 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -798,6 +798,9 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
798 setup before initializing the codecs. This option is 798 setup before initializing the codecs. This option is
799 available only when CONFIG_SND_HDA_PATCH_LOADER=y is set. 799 available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.
800 See HD-Audio.txt for details. 800 See HD-Audio.txt for details.
801 beep_mode - Selects the beep registration mode (0=off, 1=on, 2=
802 dynamic registration via mute switch on/off); the default
803 value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.
801 804
802 [Single (global) options] 805 [Single (global) options]
803 single_cmd - Use single immediate commands to communicate with 806 single_cmd - Use single immediate commands to communicate with
diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 4c7f9aee5c4e..9000cd84d076 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -391,6 +391,7 @@ STAC92HD83*
391 ref Reference board 391 ref Reference board
392 mic-ref Reference board with power management for ports 392 mic-ref Reference board with power management for ports
393 dell-s14 Dell laptop 393 dell-s14 Dell laptop
394 hp HP laptops with (inverted) mute-LED
394 auto BIOS setup (default) 395 auto BIOS setup (default)
395 396
396STAC9872 397STAC9872