diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-04 03:12:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-04 03:12:50 -0400 |
| commit | f68d891d85c8f9ab1af663ed3ceac18ad58dbabe (patch) | |
| tree | d92db7af512307ab5282eb62f3dd1741ac71d21f /Documentation/sound | |
| parent | 5780b627e24113323427c102175296ae43dfb9d7 (diff) | |
| parent | 3fd877d32cac31292628fb8f443543fc1989b49b (diff) | |
Merge branch 'topic/hda-beep' into topic/hda
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 221b81016dba..4e4d0bc9816f 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -875,8 +875,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 875 | setup before initializing the codecs. This option is | 875 | setup before initializing the codecs. This option is |
| 876 | available only when CONFIG_SND_HDA_PATCH_LOADER=y is set. | 876 | available only when CONFIG_SND_HDA_PATCH_LOADER=y is set. |
| 877 | See HD-Audio.txt for details. | 877 | See HD-Audio.txt for details. |
| 878 | beep_mode - Selects the beep registration mode (0=off, 1=on, 2= | 878 | beep_mode - Selects the beep registration mode (0=off, 1=on); default |
| 879 | dynamic registration via mute switch on/off); the default | ||
| 880 | value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig. | 879 | value is set via CONFIG_SND_HDA_INPUT_BEEP_MODE kconfig. |
| 881 | 880 | ||
| 882 | [Single (global) options] | 881 | [Single (global) options] |