Merge branch 'topic/lola' into for-linus

2011-05-22 10:01:22 +02:00
parent e28fb9c603 f428c94c84
commit b759b3ac9a
10 changed files with 3429 additions and 0 deletions
--- 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
  -------------------