summaryrefslogtreecommitdiffstats
path: root/Documentation/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-03-24 00:36:17 +0100
committerTakashi Iwai <tiwai@suse.de>2009-03-24 00:36:17 +0100
commitb54fc8dd2c43888f2754505cca2b6e88604a8ffa (patch)
tree7613f3734b0b91c316438c2fd3814a5565e8593a /Documentation/sound
parent9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (diff)
parent873591db59e66434fd0a484c92f69fc21100b33d (diff)
downloadop-kernel-dev-b54fc8dd2c43888f2754505cca2b6e88604a8ffa.zip
op-kernel-dev-b54fc8dd2c43888f2754505cca2b6e88604a8ffa.tar.gz
Merge branch 'topic/oxygen' into for-linus
Diffstat (limited to 'Documentation/sound')
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index c911c20..012858d 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -1859,7 +1859,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
-------------------
Module for sound cards based on the Asus AV100/AV200 chips,
- i.e., Xonar D1, DX, D2, D2X and HDAV1.3 (Deluxe).
+ i.e., Xonar D1, DX, D2, D2X, HDAV1.3 (Deluxe), and Essence STX.
This module supports autoprobe and multiple cards.
OpenPOWER on IntegriCloud