diff options
| author | Eric Anholt <eric@anholt.net> | 2009-04-21 15:49:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-27 17:05:59 -0700 |
| commit | e5133a94dc78411eaef324131ea8056aeb81779e (patch) | |
| tree | f6ef2a10a7e175e33605cd678d6719d0e136619c /src/common.h | |
| parent | 4653a7db622ad54a3182d93c81331765d930db34 (diff) | |
unifdef LIBPCIACCESS and XSERVER_LIBPCIACCESS.
Depending on new server means these are always present.
Diffstat (limited to 'src/common.h')
| -rw-r--r-- | src/common.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/common.h b/src/common.h index 99b46456..1576d3a1 100644 --- a/src/common.h +++ b/src/common.h @@ -322,21 +322,12 @@ extern int I810_DEBUG; #define PCI_CHIP_G41_G_BRIDGE 0x2E30 #endif -#if XSERVER_LIBPCIACCESS #define I810_MEMBASE(p,n) (p)->regions[(n)].base_addr #define VENDOR_ID(p) (p)->vendor_id #define DEVICE_ID(p) (p)->device_id #define SUBVENDOR_ID(p) (p)->subvendor_id #define SUBSYS_ID(p) (p)->subdevice_id #define CHIP_REVISION(p) (p)->revision -#else -#define I810_MEMBASE(p,n) (p)->memBase[n] -#define VENDOR_ID(p) (p)->vendor -#define DEVICE_ID(p) (p)->chipType -#define SUBVENDOR_ID(p) (p)->subsysVendor -#define SUBSYS_ID(p) (p)->subsysCard -#define CHIP_REVISION(p) (p)->chipRev -#endif #define IS_I810(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I810 || \ DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I810_DC100 || \ @@ -403,9 +394,7 @@ extern int I810_DEBUG; #define PIPE_NAME(n) ('A' + (n)) -#if XSERVER_LIBPCIACCESS struct pci_device * intel_host_bridge (void); -#endif - + #endif /* _INTEL_COMMON_H_ */ |