diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-08-19 16:55:00 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-08-28 11:27:09 +1000 |
| commit | 205c573e449b38d759273f6a51eb8c1131585ece (patch) | |
| tree | 84114a3cd10aa4f637b8aeeec822eaee9b7ecbb1 /linux-core/drmP.h | |
| parent | b4feb2c04efdcf31d094b03ea32327a06d9dcdd2 (diff) | |
remove local copies of pci domain/bus/slot/num
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 6cbb810f..642ab4b0 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -747,10 +747,6 @@ typedef struct drm_device { drm_agp_head_t *agp; /**< AGP data */ struct pci_dev *pdev; /**< PCI device structure */ - int pci_domain; /**< PCI bus domain number */ - int pci_bus; /**< PCI bus number */ - int pci_slot; /**< PCI slot number */ - int pci_func; /**< PCI function number */ #ifdef __alpha__ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) struct pci_controler *hose; @@ -776,6 +772,12 @@ static __inline__ int drm_core_check_feature(struct drm_device *dev, return ((dev->driver->driver_features & feature) ? 1 : 0); } +#ifdef __alpha__ +#define drm_get_pci_domain(dev) dev->hose->bus->number +#else +#define drm_get_pci_domain(dev) pci_domain_nr(dev->pdev->bus) +#endif + #if __OS_HAS_AGP static inline int drm_core_has_AGP(struct drm_device *dev) { |