diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-06 07:43:13 -0500 |
commit | b2faf597d93bdf5e2d12d93ea0815935a73f749e (patch) | |
tree | 1876616290ff282b8a0814e2429d23e0104f3701 /Documentation/sound/alsa/ALSA-Configuration.txt | |
parent | 638e174688f58200d0deb7435093435e7d737b09 (diff) | |
parent | 410c05427a69f53851637ccb85c2212131409fbd (diff) |
Merge branch 'origin'
Diffstat (limited to 'Documentation/sound/alsa/ALSA-Configuration.txt')
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index d2578013e829..36b511c7cade 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
@@ -837,8 +837,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
837 | 837 | ||
838 | Module for AC'97 motherboards from Intel and compatibles. | 838 | Module for AC'97 motherboards from Intel and compatibles. |
839 | * Intel i810/810E, i815, i820, i830, i84x, MX440 | 839 | * Intel i810/810E, i815, i820, i830, i84x, MX440 |
840 | ICH5, ICH6, ICH7, ESB2 | ||
840 | * SiS 7012 (SiS 735) | 841 | * SiS 7012 (SiS 735) |
841 | * NVidia NForce, NForce2 | 842 | * NVidia NForce, NForce2, NForce3, MCP04, CK804 |
843 | CK8, CK8S, MCP501 | ||
842 | * AMD AMD768, AMD8111 | 844 | * AMD AMD768, AMD8111 |
843 | * ALi m5455 | 845 | * ALi m5455 |
844 | 846 | ||
@@ -868,6 +870,12 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
868 | -------------------- | 870 | -------------------- |
869 | 871 | ||
870 | Module for Intel ICH (i8x0) chipset MC97 modems. | 872 | Module for Intel ICH (i8x0) chipset MC97 modems. |
873 | * Intel i810/810E, i815, i820, i830, i84x, MX440 | ||
874 | ICH5, ICH6, ICH7 | ||
875 | * SiS 7013 (SiS 735) | ||
876 | * NVidia NForce, NForce2, NForce2s, NForce3 | ||
877 | * AMD AMD8111 | ||
878 | * ALi m5455 | ||
871 | 879 | ||
872 | ac97_clock - AC'97 codec clock base (0 = auto-detect) | 880 | ac97_clock - AC'97 codec clock base (0 = auto-detect) |
873 | 881 | ||