diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:10 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 09:58:10 -0500 |
| commit | 75639e7ee1401b3876c7a00ffe96ea8027668690 (patch) | |
| tree | 3d6813cd3fe0d974e0a40237d003a22c5f7438dd /Documentation/sound/alsa/ControlNames.txt | |
| parent | 7584af10cf46e0f4aa1696f1be79fa0f19a945ba (diff) | |
| parent | ad1cd745060ae2f24026b3b3d09da3426df6ab36 (diff) | |
Merge branch 'topic/beep-rename' into topic/core-change
Diffstat (limited to 'Documentation/sound/alsa/ControlNames.txt')
| -rw-r--r-- | Documentation/sound/alsa/ControlNames.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ControlNames.txt b/Documentation/sound/alsa/ControlNames.txt index 5b18298e9495..fea65bb6269e 100644 --- a/Documentation/sound/alsa/ControlNames.txt +++ b/Documentation/sound/alsa/ControlNames.txt | |||
| @@ -18,8 +18,9 @@ SOURCE: | |||
| 18 | Master | 18 | Master |
| 19 | Master Mono | 19 | Master Mono |
| 20 | Hardware Master | 20 | Hardware Master |
| 21 | Speaker (internal speaker) | ||
| 21 | Headphone | 22 | Headphone |
| 22 | PC Speaker | 23 | Beep (beep generator) |
| 23 | Phone | 24 | Phone |
| 24 | Phone Input | 25 | Phone Input |
| 25 | Phone Output | 26 | Phone Output |