patch-2.4.20 linux-2.4.20/drivers/sound/i810_audio.c
Next file: linux-2.4.20/drivers/sound/maestro3.c
Previous file: linux-2.4.20/drivers/sound/harmony.c
Back to the patch index
Back to the overall index
- Lines: 48
- Date:
Thu Nov 28 15:53:14 2002
- Orig file:
linux-2.4.19/drivers/sound/i810_audio.c
- Orig date:
Fri Aug 2 17:39:44 2002
diff -urN linux-2.4.19/drivers/sound/i810_audio.c linux-2.4.20/drivers/sound/i810_audio.c
@@ -113,6 +113,12 @@
#ifndef PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO
#define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO 0x01b1
#endif
+#ifndef PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO
+#define PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO 0x006a
+#endif
+#ifndef PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO
+#define PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO 0x00da
+#endif
#ifndef PCI_DEVICE_ID_AMD_768_AUDIO
#define PCI_DEVICE_ID_AMD_768_AUDIO 0x7445
#endif
@@ -239,7 +245,8 @@
INTELICH4,
SI7012,
NVIDIA_NFORCE,
- AMD768
+ AMD768,
+ AMD8111
};
static char * card_names[] = {
@@ -251,7 +258,8 @@
"Intel ICH4",
"SiS 7012",
"NVIDIA nForce Audio",
- "AMD 768"
+ "AMD 768",
+ "AMD-8111 IOHub"
};
static struct pci_device_id i810_pci_tbl [] __initdata = {
@@ -271,8 +279,14 @@
PCI_ANY_ID, PCI_ANY_ID, 0, 0, SI7012},
{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
+ {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_MCP2_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
+ {PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_MCP3_AUDIO,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, NVIDIA_NFORCE},
{PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_768_AUDIO,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD768},
+ {PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_AC97,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD8111},
{0,}
};
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)