diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:30 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 11:40:30 +0100 |
commit | cc4910850f93a8bb1cbafad038fd40f6da68c783 (patch) | |
tree | 78cec60ca8c6fa3d262a85373a8719a973a10dda /Documentation/sound | |
parent | a8022697811c3f2271df5ec14fa6f518b731b46a (diff) | |
parent | de04b102bfc9a13e96f0892305b394077ffb6514 (diff) | |
download | linux-3.10-cc4910850f93a8bb1cbafad038fd40f6da68c783.tar.gz linux-3.10-cc4910850f93a8bb1cbafad038fd40f6da68c783.tar.bz2 linux-3.10-cc4910850f93a8bb1cbafad038fd40f6da68c783.zip |
Merge branch 'topic/oxygen' into to-push
Diffstat (limited to 'Documentation/sound')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index ee45454c50b..841a9365d5f 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. * AuzenTech X-Meridian * Bgears b-Enspirer * Club3D Theatron DTS - * HT-Omega Claro + * HT-Omega Claro (plus) + * HT-Omega Claro halo (XT) * Razer Barracuda AC-1 * Sondigo Inferno |