summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-03-06 08:16:51 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-03-06 08:16:51 +1000
commitf5d1cd2cb6808838ae1a188cef888eaa9582c76d (patch)
tree8497f45acfc111f211eaecb0528ea51073ee4da9
parent248de8cdbd6d0bc062633b49896fa4791148cd3b (diff)
remove use of xf86PciInfo.h, deprecated now apparently
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--src/nv_driver.c4
-rw-r--r--src/nv_include.h3
2 files changed, 2 insertions, 5 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 7512464..667a0a7 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -65,8 +65,8 @@ static Bool NVUnmapMem(ScrnInfoPtr pScrn);
0x00030000, 0x00ffffff, 0 }
static const struct pci_id_match nouveau_device_match[] = {
- NOUVEAU_PCI_DEVICE(PCI_VENDOR_NVIDIA, PCI_MATCH_ANY),
- NOUVEAU_PCI_DEVICE(PCI_VENDOR_NVIDIA_SGS, PCI_MATCH_ANY),
+ NOUVEAU_PCI_DEVICE(0x12d2, PCI_MATCH_ANY),
+ NOUVEAU_PCI_DEVICE(0x10de, PCI_MATCH_ANY),
{ 0, 0, 0 },
};
diff --git a/src/nv_include.h b/src/nv_include.h
index 496eefe..407b7c9 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -17,9 +17,6 @@
#define PPC_MMIO_IS_BE
#include "compiler.h"
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"