diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:22 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:22 -0400 |
| commit | b759b3ac9aee3afb01c21b603970ebb200c8048e (patch) | |
| tree | 8a7bc11819410c47d248a3fc27579190853179df /Documentation/sound | |
| parent | e28fb9c603f321e0bb4c6c43d58b31de052d6de6 (diff) | |
| parent | f428c94c842343b8580751cf637794050ca12d77 (diff) | |
Merge branch 'topic/lola' into for-linus
Diffstat (limited to 'Documentation/sound')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 9822afb6313c..89757012c7ff 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -1230,6 +1230,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1230 | This module supports multiple cards. | 1230 | This module supports multiple cards. |
| 1231 | The driver requires the firmware loader support on kernel. | 1231 | The driver requires the firmware loader support on kernel. |
| 1232 | 1232 | ||
| 1233 | Module snd-lola | ||
| 1234 | --------------- | ||
| 1235 | |||
| 1236 | Module for Digigram Lola PCI-e boards | ||
| 1237 | |||
| 1238 | This module supports multiple cards. | ||
| 1239 | |||
| 1233 | Module snd-lx6464es | 1240 | Module snd-lx6464es |
| 1234 | ------------------- | 1241 | ------------------- |
| 1235 | 1242 | ||