aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-25 05:40:30 -0500
committerTakashi Iwai <tiwai@suse.de>2008-12-25 05:40:30 -0500
commitcc4910850f93a8bb1cbafad038fd40f6da68c783 (patch)
tree78cec60ca8c6fa3d262a85373a8719a973a10dda /Documentation
parenta8022697811c3f2271df5ec14fa6f518b731b46a (diff)
parentde04b102bfc9a13e96f0892305b394077ffb6514 (diff)
Merge branch 'topic/oxygen' into to-push
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index ee45454c50be..841a9365d5fd 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1350,7 +1350,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
1350 * AuzenTech X-Meridian 1350 * AuzenTech X-Meridian
1351 * Bgears b-Enspirer 1351 * Bgears b-Enspirer
1352 * Club3D Theatron DTS 1352 * Club3D Theatron DTS
1353 * HT-Omega Claro 1353 * HT-Omega Claro (plus)
1354 * HT-Omega Claro halo (XT)
1354 * Razer Barracuda AC-1 1355 * Razer Barracuda AC-1
1355 * Sondigo Inferno 1356 * Sondigo Inferno
1356 1357