summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Carlier <lordheavym@gmail.com>2016-11-21 11:14:52 +0100
committerAlan Coopersmith <alan.coopersmith@oracle.com>2022-09-29 18:19:25 -0700
commitd67f3a5bf7feadbfdf92038b459c622dc96b17a0 (patch)
treecc35b405c0db0581408f9deb4006dc9b5f771a68
parent6375a5849dc57af79e058590ebea56fd6f629c11 (diff)
Stop using deprecated xf86PciInfo.h
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/voodoo.h5
-rw-r--r--src/voodoo_dga.c1
-rw-r--r--src/voodoo_driver.c1
-rw-r--r--src/voodoo_hardware.c1
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 dda72a4..c30c5c2 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 5584a53..dfb4a58 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 59ee59b..c360263 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"