diff options
Diffstat (limited to 'src/mga_merge.c')
| -rw-r--r-- | src/mga_merge.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c index aa14dbe..359cdcf 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -272,8 +272,9 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) return TRUE; } +#ifndef XSERVER_LIBPCIACCESS pMga->PciTag = pMga1->PciTag; - +#endif pMga->Primary = pMga1->Primary; /* Set pScrn->monitor */ @@ -370,12 +371,13 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) } pMga->FbAddress = pMga1->FbAddress; - pMga->FbBaseReg = pMga1->FbBaseReg; pMga->PciInfo = pMga1->PciInfo; +#ifndef XSERVER_LIBPCIACCESS pMga->IOAddress = pMga1->IOAddress; pMga->ILOADAddress = pMga1->ILOADAddress; pMga->BiosFrom = pMga1->BiosFrom; pMga->BiosAddress = pMga1->BiosAddress; +#endif /* * Read the BIOS data struct |