aboutsummaryrefslogtreecommitdiff
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-08 09:35:50 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-08 09:35:50 +0100
commita3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch)
tree5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /Documentation/sound
parentf0f20a16983f7d3713ab695e19bd15eca4e7533f (diff)
parent2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff)
downloadlinux-linaro-android-a3087ae970e5c8984fab2306b1f4dbe5ef132ff7.tar.gz
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 33df82e3a39..bfcbbf88c44 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1812,7 +1812,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
Module snd-ua101
----------------
- Module for the Edirol UA-101 audio/MIDI interface.
+ Module for the Edirol UA-101/UA-1000 audio/MIDI interfaces.
This module supports multiple devices, autoprobe and hotplugging.