diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 11:52:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 11:52:40 -0700 |
| commit | 4ad193b43f6da6f15e19eda338c71e5b41383912 (patch) | |
| tree | ac3d51633e00e5b64c2acf61416e6e55d1363b84 /Documentation | |
| parent | cebd7709d396b59ff53b95fa3c4d9febbd4c010f (diff) | |
| parent | 97bb8129e5deb3c0584391a5d2348966732e2233 (diff) | |
| download | kernel-crypto-4ad193b43f6da6f15e19eda338c71e5b41383912.tar.gz kernel-crypto-4ad193b43f6da6f15e19eda338c71e5b41383912.tar.xz kernel-crypto-4ad193b43f6da6f15e19eda338c71e5b41383912.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: wm8990: Implement speaker volume PGA
ALSA: wm8990: Fix routing of left DAC to speaker mixer
ALSA: virtuoso: add Xonar D1 support
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index 6f6d117ac7e..b117e42a616 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1144,8 +1144,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. This module supports autoprobe and multiple cards. - Power management is _not_ supported. - Module snd-ice1712 ------------------ @@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. This module supports autoprobe and multiple cards. - Power management is _not_ supported. - Module snd-pcsp ----------------- @@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. Module snd-virtuoso ------------------- - Module for sound cards based on the Asus AV200 chip, i.e., - Xonar D2 and Xonar D2X. + Module for sound cards based on the Asus AV100/AV200 chips, + i.e., Xonar D1, DX, D2 and D2X. This module supports autoprobe and multiple cards. - Power management is _not_ supported. - Module snd-vx222 ---------------- |