aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-02 05:27:46 -0500
committerTakashi Iwai <tiwai@suse.de>2010-03-02 05:27:46 -0500
commit156366d31524dc6b88836f06dccb1be13dbef5f1 (patch)
tree5ae1fee7169edd9bebace22394f0777af21fca63 /Documentation
parent7f9320d415fab5c05097c77eea7a77f2f6341f24 (diff)
parent0a566ec25627bdd360f7294aa2e52f9d121233b4 (diff)
Merge remote branch 'alsa/devel' into topic/misc
Conflicts: sound/usb/usbaudio.c
Diffstat (limited to 'Documentation')
-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 33df82e3a398..bfcbbf88c44d 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.
1812 Module snd-ua101 1812 Module snd-ua101
1813 ---------------- 1813 ----------------
1814 1814
1815 Module for the Edirol UA-101 audio/MIDI interface. 1815 Module for the Edirol UA-101/UA-1000 audio/MIDI interfaces.
1816 1816
1817 This module supports multiple devices, autoprobe and hotplugging. 1817 This module supports multiple devices, autoprobe and hotplugging.
1818 1818