diff options
| author | Julien Cristau <jcristau@debian.org> | 2012-05-01 15:25:30 +0200 |
|---|---|---|
| committer | Julien Cristau <jcristau@debian.org> | 2012-05-01 15:40:03 +0200 |
| commit | 37630bd20e59e49db3ee0bfa77f82a7c2595a0ac (patch) | |
| tree | 1a63667c72cedd4091c5a2d3f0d010d0295f6825 | |
| parent | 784c3a1fa53771662b4656e193fb392cbb8c8452 (diff) | |
Stop including xf86PciInfo.h
Deprecated in xserver commit 1f5baa924a5907978f564372265d9830ac72a077
| -rw-r--r-- | src/apm.h | 3 | ||||
| -rw-r--r-- | src/apm_dga.c | 1 | ||||
| -rw-r--r-- | src/apm_driver.c | 8 |
3 files changed, 5 insertions, 7 deletions
@@ -11,9 +11,6 @@ /* Everything using inb/outb, etc needs "compiler.h" */ #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" diff --git a/src/apm_dga.c b/src/apm_dga.c index 855c08e..d250251 100644 --- a/src/apm_dga.c +++ b/src/apm_dga.c @@ -11,7 +11,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "xaa.h" #include "xaalocal.h" #include "apm.h" diff --git a/src/apm_driver.c b/src/apm_driver.c index 2145207..8f25a3c 100644 --- a/src/apm_driver.c +++ b/src/apm_driver.c @@ -28,9 +28,11 @@ #define APM_MAJOR_VERSION PACKAGE_VERSION_MAJOR #define APM_MINOR_VERSION PACKAGE_VERSION_MINOR #define APM_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL -#ifndef PCI_CHIP_AT3D -#define PCI_CHIP_AT3D 0x643D -#endif + +#define PCI_VENDOR_ALLIANCE 0x1142 +#define PCI_CHIP_AP6422 0x6422 +#define PCI_CHIP_AT24 0x6424 +#define PCI_CHIP_AT3D 0x643D /* bytes to save for text/font data */ #define TEXT_AMOUNT 32768 |