diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:58:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-01 15:58:10 +0100 |
| commit | 75639e7ee1401b3876c7a00ffe96ea8027668690 (patch) | |
| tree | 3d6813cd3fe0d974e0a40237d003a22c5f7438dd /Documentation/sound/alsa/ControlNames.txt | |
| parent | sound: rawmidi: record a substream's owner process (diff) | |
| parent | ALSA: rename "PC Speaker" controls to "Speaker" (diff) | |
| download | linux-75639e7ee1401b3876c7a00ffe96ea8027668690.tar.xz linux-75639e7ee1401b3876c7a00ffe96ea8027668690.zip | |
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: Master Master Mono Hardware Master + Speaker (internal speaker) Headphone - PC Speaker + Beep (beep generator) Phone Phone Input Phone Output |