diff options
-rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 10 | ||||
-rw-r--r-- | sound/pci/intel8x0.c | 1 |
2 files changed, 10 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 | ||
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index b345894659bb..174237f4a22c 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -427,6 +427,7 @@ static struct pci_device_id snd_intel8x0_ids[] = { | |||
427 | { 0x10de, 0x008a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8 */ | 427 | { 0x10de, 0x008a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8 */ |
428 | { 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */ | 428 | { 0x10de, 0x00da, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* NFORCE3 */ |
429 | { 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8S */ | 429 | { 0x10de, 0x00ea, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* CK8S */ |
430 | { 0x10de, 0x026b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_NFORCE }, /* MCP51 */ | ||
430 | { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */ | 431 | { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */ |
431 | { 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */ | 432 | { 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */ |
432 | { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */ | 433 | { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */ |