diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:22 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 10:01:22 +0200 |
commit | b759b3ac9aee3afb01c21b603970ebb200c8048e (patch) | |
tree | 8a7bc11819410c47d248a3fc27579190853179df /Documentation/sound | |
parent | SOUND: OSS: Remove Au1550 driver. (diff) | |
parent | ALSA: lola - fix lola build (diff) | |
download | linux-b759b3ac9aee3afb01c21b603970ebb200c8048e.tar.xz linux-b759b3ac9aee3afb01c21b603970ebb200c8048e.zip |
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. This module supports multiple cards. The driver requires the firmware loader support on kernel. + Module snd-lola + --------------- + + Module for Digigram Lola PCI-e boards + + This module supports multiple cards. + Module snd-lx6464es ------------------- |