aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:34 -0400
committerTakashi Iwai <tiwai@suse.de>2009-06-10 01:26:34 -0400
commit03cece06c41431ab71affc540d587e61894d7572 (patch)
treeb20f17531701edefd7bdc583344b3715b1c061f2 /Documentation/sound
parent3c2fcf36d78d75eef46c2e39483ff8c3230ae335 (diff)
parent8338c300642f67af5a8cc279ca5e088c7055b7eb (diff)
Merge branch 'topic/lx6464es' into for-linus
* topic/lx6464es: ALSA: Add missing description of lx6464es to ALSA-Configuration.txt ALSA: lx6464es - Disable lx_message_send() ALSA: lx6464es - Use snd_card_create() ALSA: lx6464es - driver for the digigram lx6464es interface
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 c903db869dd..8cf17fe4300 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1112,6 +1112,13 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1112 This module supports multiple cards. 1112 This module supports multiple cards.
1113 The driver requires the firmware loader support on kernel. 1113 The driver requires the firmware loader support on kernel.
1114 1114
1115 Module snd-lx6464es
1116 -------------------
1117
1118 Module for Digigram LX6464ES boards
1119
1120 This module supports multiple cards.
1121
1115 Module snd-maestro3 1122 Module snd-maestro3
1116 ------------------- 1123 -------------------
1117 1124