PATCH: make i810 audio compile

Alan Cox (alan@lxorguk.ukuu.org.uk)
Sat, 5 Jul 2003 17:37:22 +0100


This one still oopses when you unload it but thats a known bug with a known
fix I need to merge later

diff --exclude-from /usr/src/exclude -u --recursive linux.22-bk2/drivers/sound/i810_audio.c linux.22-pre2-ac1/drivers/sound/i810_audio.c
--- linux.22-bk2/drivers/sound/i810_audio.c 2003-07-05 17:01:44.000000000 +0100
+++ linux.22-pre2-ac1/drivers/sound/i810_audio.c 2003-06-29 16:10:11.000000000 +0100
@@ -118,6 +118,9 @@
#ifndef PCI_DEVICE_ID_INTEL_ICH4
#define PCI_DEVICE_ID_INTEL_ICH4 0x24c5
#endif
+#ifndef PCI_DEVICE_ID_INTEL_ICH5
+#define PCI_DEVICE_ID_INTEL_ICH5 0x24d5
+#endif
#ifndef PCI_DEVICE_ID_INTEL_440MX
#define PCI_DEVICE_ID_INTEL_440MX 0x7195
#endif
@@ -273,6 +276,7 @@
INTELICH2,
INTELICH3,
INTELICH4,
+ INTELICH5,
SI7012,
NVIDIA_NFORCE,
AMD768,
@@ -286,6 +290,7 @@
"Intel ICH2",
"Intel ICH3",
"Intel ICH4",
+ "Intel ICH5",
"SiS 7012",
"NVIDIA nForce Audio",
"AMD 768",
@@ -304,7 +309,8 @@
{ 1, 0x0000 }, /* INTEL440MX */
{ 1, 0x0000 }, /* INTELICH2 */
{ 2, 0x0000 }, /* INTELICH3 */
- { 3, 0x0003 }, /* INTELICH4 */
+ { 3, 0x0003 }, /* INTELICH4 */
+ { 3, 0x0003 }, /* INTELICH5 */
/*@FIXME to be verified*/ { 2, 0x0000 }, /* SI7012 */
/*@FIXME to be verified*/ { 2, 0x0000 }, /* NVIDIA_NFORCE */
/*@FIXME to be verified*/ { 2, 0x0000 }, /* AMD768 */
@@ -324,6 +330,8 @@
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_INTEL, PCI_DEVICE_ID_INTEL_ICH5,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, INTELICH5},
{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,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/