Merge branch 'topic/hda' into for-linus

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.
                 setup before initializing the codecs.  This option is
                 available only when CONFIG_SND_HDA_PATCH_LOADER=y is set.
                 See HD-Audio.txt for details.
+    beep_mode   - Selects the beep registration mode (0=off, 1=on, 2=
+                dynamic registration via mute switch on/off); the default
+                value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig.
     
     [Single (global) options]
     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*
   ref           Reference board
   mic-ref       Reference board with power management for ports
   dell-s14      Dell laptop
+  hp            HP laptops with (inverted) mute-LED
   auto          BIOS setup (default)
 
 STAC9872