aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-22 10:01:22 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-22 10:01:22 +0200
commitb759b3ac9aee3afb01c21b603970ebb200c8048e (patch)
tree8a7bc11819410c47d248a3fc27579190853179df /Documentation/sound
parente28fb9c603f321e0bb4c6c43d58b31de052d6de6 (diff)
parentf428c94c842343b8580751cf637794050ca12d77 (diff)
downloadkernel_samsung_aries-b759b3ac9aee3afb01c21b603970ebb200c8048e.zip
kernel_samsung_aries-b759b3ac9aee3afb01c21b603970ebb200c8048e.tar.gz
kernel_samsung_aries-b759b3ac9aee3afb01c21b603970ebb200c8048e.tar.bz2
Merge branch 'topic/lola' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 9822afb..8975701 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
-------------------