diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-09-09 13:29:24 -0700 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-09-11 13:57:23 -0700 |
| commit | a419c141d67728f84fdb376257618fe199154d29 (patch) | |
| tree | d0d346b2d9ea6f9304b358c020f09f31019d2661 | |
| parent | 3a4cd45c63671f89bed7b1c9cc518ac028c189d3 (diff) | |
Remove uses of xf86PciInfo.h
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | src/neo.h | 11 | ||||
| -rw-r--r-- | src/neo_2090.c | 1 | ||||
| -rw-r--r-- | src/neo_dga.c | 1 | ||||
| -rw-r--r-- | src/neo_driver.c | 3 | ||||
| -rw-r--r-- | src/neo_i2c.c | 1 | ||||
| -rw-r--r-- | src/neo_shadow.c | 1 |
6 files changed, 11 insertions, 7 deletions
@@ -320,3 +320,14 @@ typedef struct { #define PROBED_NM2097 0x83 #define PROBED_NM2160 0x44 #define PROBED_NM2200 0x45 + +#define PCI_VENDOR_NEOMAGIC 0x10C8 +#define PCI_CHIP_NM2070 0x0001 +#define PCI_CHIP_NM2090 0x0002 +#define PCI_CHIP_NM2093 0x0003 +#define PCI_CHIP_NM2097 0x0083 +#define PCI_CHIP_NM2160 0x0004 +#define PCI_CHIP_NM2200 0x0005 +#define PCI_CHIP_NM2230 0x0025 +#define PCI_CHIP_NM2360 0x0006 +#define PCI_CHIP_NM2380 0x0016 diff --git a/src/neo_2090.c b/src/neo_2090.c index 5049ab4..2f1efc8 100644 --- a/src/neo_2090.c +++ b/src/neo_2090.c @@ -42,7 +42,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" #include "xf86_OSproc.h" #include "compiler.h" -#include "xf86PciInfo.h" /* Drivers that use XAA need this */ #include "xf86fbman.h" diff --git a/src/neo_dga.c b/src/neo_dga.c index 8ea31a9..c5d60d5 100644 --- a/src/neo_dga.c +++ b/src/neo_dga.c @@ -29,7 +29,6 @@ #include "xf86.h" #include "xf86_OSproc.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "neo.h" #include "neo_reg.h" #include "dgaproc.h" diff --git a/src/neo_driver.c b/src/neo_driver.c index d7369e2..ce89ce0 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86RAC.h" #endif -/* 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/neo_i2c.c b/src/neo_i2c.c index 82d1f2a..5bbb3fb 100644 --- a/src/neo_i2c.c +++ b/src/neo_i2c.c @@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "compiler.h" #include "xf86Pci.h" -#include "xf86PciInfo.h" #include "vgaHW.h" diff --git a/src/neo_shadow.c b/src/neo_shadow.c index 2df7657..04efe4f 100644 --- a/src/neo_shadow.c +++ b/src/neo_shadow.c @@ -10,7 +10,6 @@ #include "xf86.h" #include "xf86_OSproc.h" -#include "xf86PciInfo.h" #include "xf86Pci.h" #include "shadowfb.h" #include "servermd.h" |