[PATCH 1/2] Stop using deprecated xf86PciInfo.h

Laurent Carlier lordheavym at gmail.com
Mon Nov 21 10:14:52 UTC 2016


---
 src/voodoo.h          | 5 +++--
 src/voodoo_dga.c      | 1 -
 src/voodoo_driver.c   | 1 -
 src/voodoo_hardware.c | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/voodoo.h b/src/voodoo.h
index c3eb64e..846ce66 100644
--- a/src/voodoo.h
+++ b/src/voodoo.h
@@ -90,8 +90,9 @@ typedef struct {
 #define VOODOO_MINOR_VERSION 1
 #define VOODOO_PATCHLEVEL 0
 
-#define PCI_CHIP_VOODOO1	0x0001
-#define PCI_CHIP_VOODOO2	0x0002
+#define PCI_VENDOR_3DFX			0x121A
+#define PCI_CHIP_VOODOO1		0x0001 /* PCI_CHIP_VOODOO_GRAPHICS */
+#define PCI_CHIP_VOODOO2		0x0002
 
 /*
  *	Hardware functions
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index edcde47..4ae6cc0 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -41,7 +41,6 @@
 #include "micmap.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86cmap.h"
 #include "shadowfb.h"
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 6ef12ae..876dbe4 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -50,7 +50,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xorgVersion.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86cmap.h"
 #include "shadowfb.h"
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 5a85446..8dae954 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -42,7 +42,6 @@
 #include "micmap.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
 #include "xf86Pci.h"
 #include "xf86cmap.h"
 #include "shadowfb.h"
-- 
2.10.2



More information about the xorg-devel mailing list