diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-08-31 11:05:57 -0700 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-08-31 11:05:57 -0700 |
| commit | 923176f5aad777b4023003a457bb77da21373389 (patch) | |
| tree | c5d50681090ba9f529c8e55a87d6d727abf6eb6a /src/mga_merge.c | |
| parent | 90beb8c27b4206b593898d346bf37ab49e75b975 (diff) | |
Use XSERVER_LIBPCIACCESS to detect pci-rework.
Diffstat (limited to 'src/mga_merge.c')
| -rw-r--r-- | src/mga_merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c index 141b0c3..359cdcf 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -272,7 +272,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) return TRUE; } -#ifndef PCIACCESS +#ifndef XSERVER_LIBPCIACCESS pMga->PciTag = pMga1->PciTag; #endif pMga->Primary = pMga1->Primary; @@ -372,7 +372,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) pMga->FbAddress = pMga1->FbAddress; pMga->PciInfo = pMga1->PciInfo; -#ifndef PCIACCESS +#ifndef XSERVER_LIBPCIACCESS pMga->IOAddress = pMga1->IOAddress; pMga->ILOADAddress = pMga1->ILOADAddress; pMga->BiosFrom = pMga1->BiosFrom; |