diff -urpN --exclude-from=/home/davej/.exclude bk-linus/sound/oss/i810_audio.c linux-2.5/sound/oss/i810_audio.c --- bk-linus/sound/oss/i810_audio.c 2002-11-21 02:26:05.000000000 +0000 +++ linux-2.5/sound/oss/i810_audio.c 2002-11-21 18:06:19.000000000 +0000 @@ -101,6 +101,9 @@ #ifndef PCI_DEVICE_ID_INTEL_ICH3 #define PCI_DEVICE_ID_INTEL_ICH3 0x2485 #endif +#ifndef PCI_DEVICE_ID_INTEL_ICH4 +#define PCI_DEVICE_ID_INTEL_ICH4 0x24c5 +#endif #ifndef PCI_DEVICE_ID_INTEL_440MX #define PCI_DEVICE_ID_INTEL_440MX 0x7195 #endif @@ -110,6 +113,9 @@ #ifndef PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO #define PCI_DEVICE_ID_NVIDIA_MCP1_AUDIO 0x01b1 #endif +#ifndef PCI_DEVICE_ID_AMD_768_AUDIO +#define PCI_DEVICE_ID_AMD_768_AUDIO 0x7445 +#endif static int ftsodell=0; static int strict_clocking=0; @@ -230,8 +236,11 @@ enum { INTEL440MX, INTELICH2, INTELICH3, + INTELICH4, SI7012, - NVIDIA_NFORCE + NVIDIA_NFORCE, + AMD768, + AMD8111 }; static char * card_names[] = { @@ -240,8 +249,11 @@ static char * card_names[] = { "Intel 440MX", "Intel ICH2", "Intel ICH3", + "Intel ICH4", "SiS 7012", - "NVIDIA nForce Audio" + "NVIDIA nForce Audio", + "AMD 768", + "AMD-8111 IOHub" }; static struct pci_device_id i810_pci_tbl [] __initdata = { @@ -255,10 +267,16 @@ static struct pci_device_id i810_pci_tbl PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH2}, {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH3}, + {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH4, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH4}, {PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7012, 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_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_AUDIO, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, AMD8111}, {0,} };