diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 14:52:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-15 14:52:40 -0400 |
| commit | 4ad193b43f6da6f15e19eda338c71e5b41383912 (patch) | |
| tree | ac3d51633e00e5b64c2acf61416e6e55d1363b84 /Documentation | |
| parent | cebd7709d396b59ff53b95fa3c4d9febbd4c010f (diff) | |
| parent | 97bb8129e5deb3c0584391a5d2348966732e2233 (diff) | |
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 6f6d117ac7e2..b117e42a6166 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. | |||
| 1144 | 1144 | ||
| 1145 | This module supports autoprobe and multiple cards. | 1145 | This module supports autoprobe and multiple cards. |
| 1146 | 1146 | ||
| 1147 | Power management is _not_ supported. | ||
| 1148 | |||
| 1149 | Module snd-ice1712 | 1147 | Module snd-ice1712 |
| 1150 | ------------------ | 1148 | ------------------ |
| 1151 | 1149 | ||
| @@ -1628,8 +1626,6 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 1628 | 1626 | ||
| 1629 | This module supports autoprobe and multiple cards. | 1627 | This module supports autoprobe and multiple cards. |
| 1630 | 1628 | ||
| 1631 | Power management is _not_ supported. | ||
| 1632 | |||
| 1633 | Module snd-pcsp | 1629 | Module snd-pcsp |
| 1634 | ----------------- | 1630 | ----------------- |
| 1635 | 1631 | ||
| @@ -2081,13 +2077,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 2081 | Module snd-virtuoso | 2077 | Module snd-virtuoso |
| 2082 | ------------------- | 2078 | ------------------- |
| 2083 | 2079 | ||
| 2084 | Module for sound cards based on the Asus AV200 chip, i.e., | 2080 | Module for sound cards based on the Asus AV100/AV200 chips, |
| 2085 | Xonar D2 and Xonar D2X. | 2081 | i.e., Xonar D1, DX, D2 and D2X. |
| 2086 | 2082 | ||
| 2087 | This module supports autoprobe and multiple cards. | 2083 | This module supports autoprobe and multiple cards. |
| 2088 | 2084 | ||
| 2089 | Power management is _not_ supported. | ||
| 2090 | |||
| 2091 | Module snd-vx222 | 2085 | Module snd-vx222 |
| 2092 | ---------------- | 2086 | ---------------- |
| 2093 | 2087 | ||