[PATCH] sisfb.c/sis5513.c/agpgart_be.c related bugfix

From: Bartlomiej Zolnierkiewicz (dake@staszic.waw.pl)
Date: Sun Jun 25 2000 - 06:03:26 EST

2.4.0-test2 changes PCI DIDs for SiS 540 and 630. These changes are bad
because drivers/ide/sis5513.c and drivers/agp/agpgart_be.c depends on DIDs
of SiS chipsets not on DIDs of video chips. Here is a quick fix...

diff -uNr linux-2.4.0-test2/drivers/video/sisfb.c linux/drivers/video/sisfb.c
--- linux-2.4.0-test2/drivers/video/sisfb.c Sat Jun 24 23:33:15 2000
+++ linux/drivers/video/sisfb.c Sun Jun 25 12:38:13 2000
@@ -175,9 +175,9 @@
         const char *name;
 } dev_list[] = {
         {
- PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, "SIS 300"}, {
- PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_540, "SIS 540"}, {
- PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_630, "SIS 630"}, {
+ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_300, "SIS 300"}, {
+ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5300, "SIS 540"}, {
+ PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_6300, "SIS 630"}, {
         0, 0, NULL}
 };
 
diff -uNr linux-2.4.0-test2/include/linux/pci_ids.h linux/include/linux/pci_ids.h
--- linux-2.4.0-test2/include/linux/pci_ids.h Sat Jun 24 23:33:15 2000
+++ linux/include/linux/pci_ids.h Sun Jun 25 12:29:26 2000
@@ -329,13 +329,14 @@
 #define PCI_DEVICE_ID_SI_6205 0x0205
 #define PCI_DEVICE_ID_SI_501 0x0406
 #define PCI_DEVICE_ID_SI_496 0x0496
-#define PCI_DEVICE_ID_SI_300 0x0300
+#define PCI_DEVICE_ID_SI_300 0x0300
 #define PCI_DEVICE_ID_SI_530 0x0530
-#define PCI_DEVICE_ID_SI_540 0x5300
+#define PCI_DEVICE_ID_SI_540 0x0540
 #define PCI_DEVICE_ID_SI_601 0x0601
 #define PCI_DEVICE_ID_SI_620 0x0620
-#define PCI_DEVICE_ID_SI_630 0x6300
+#define PCI_DEVICE_ID_SI_630 0x0630
 #define PCI_DEVICE_ID_SI_5107 0x5107
+#define PCI_DEVICE_ID_SI_5300 0x5300
 #define PCI_DEVICE_ID_SI_5511 0x5511
 #define PCI_DEVICE_ID_SI_5513 0x5513
 #define PCI_DEVICE_ID_SI_5571 0x5571
@@ -343,6 +344,7 @@
 #define PCI_DEVICE_ID_SI_5597 0x5597
 #define PCI_DEVICE_ID_SI_5598 0x5598
 #define PCI_DEVICE_ID_SI_5600 0x5600
+#define PCI_DEVICE_ID_SI_6300 0x6300
 #define PCI_DEVICE_ID_SI_6306 0x6306
 #define PCI_DEVICE_ID_SI_6326 0x6326
 #define PCI_DEVICE_ID_SI_7001 0x7001 

--
Bartlomiej Zolnierkiewicz
<bkz@linux-ide.org>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Mon Jun 26 2000 - 21:00:07 EST