diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-08 03:35:50 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-08 03:35:50 -0500 |
| commit | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (patch) | |
| tree | 5d9ecc2dd903ed506c58a31f1076b2df500a6fe0 /Documentation | |
| parent | f0f20a16983f7d3713ab695e19bd15eca4e7533f (diff) | |
| parent | 2b9ddcb8b2ce6a44f0f969000f16b016caa64294 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 2 |
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 | ||