chips: drop usage of deprecated xf86PciInfo.h

Just takes the pci ids chips needs into the driver.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2012-06-05 19:09:05 +01:00
parent 93f4ceaa28
commit a912214b47
9 changed files with 13 additions and 21 deletions

View File

@@ -46,9 +46,6 @@
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
/* Drivers for PCI hardware need this */
#include "xf86PciInfo.h"
/* Drivers that use XAA need this */
#include "xf86fbman.h"

View File

@@ -47,9 +47,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"

View File

@@ -36,9 +36,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"

View File

@@ -10,9 +10,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"

View File

@@ -6,7 +6,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xaa.h"
#include "xaalocal.h"
#include "ct_driver.h"

View File

@@ -79,9 +79,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"
@@ -480,6 +477,19 @@ static DisplayModeRec ChipsNTSCMode = {
#ifdef XSERVER_LIBPCIACCESS
#ifndef _XF86_PCIINFO_H
#define PCI_VENDOR_CHIPSTECH 0x102C
/* Chips & Tech */
#define PCI_CHIP_65545 0x00D8
#define PCI_CHIP_65548 0x00DC
#define PCI_CHIP_65550 0x00E0
#define PCI_CHIP_65554 0x00E4
#define PCI_CHIP_65555 0x00E5
#define PCI_CHIP_68554 0x00F4
#define PCI_CHIP_69000 0x00C0
#define PCI_CHIP_69030 0x0C30
#endif
#define CHIPS_DEVICE_MATCH(d, i) \
{ PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }

View File

@@ -58,9 +58,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"

View File

@@ -5,7 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
#include "servermd.h"

View File

@@ -6,7 +6,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86fbman.h"
#include "regionstr.h"