diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-19 00:55:17 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-10-19 00:55:17 -0700 |
| commit | da09f04b6d7da1ca10ce9d20a00d8ac9f2c0adb7 (patch) | |
| tree | 051477df0097703b18c8e57d6949cf9409e2f1a8 | |
| parent | 0bd545e1301d55c5874484f2a4a7952b6eca48c0 (diff) | |
Build fix for ABI Version 12
ABI Version 12 removes support for multiple PCI domains. If you need to
use this driver on a system with more than one PCI domain, you should
either port this driver to using libpciaccess directly or stick with an
older server.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | src/trident_driver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/trident_driver.c b/src/trident_driver.c index 2d9d0de..addf36e 100644 --- a/src/trident_driver.c +++ b/src/trident_driver.c @@ -1109,7 +1109,12 @@ TRIDENTPreInit(ScrnInfoPtr pScrn, int flags) hwp = VGAHWPTR(pScrn); vgaHWGetIOBase(hwp); vgaIOBase = hwp->IOBase; + +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12 pTrident->PIOBase = hwp->PIOOffset; +#else + pTrident->PIOBase = 0; +#endif #ifndef XSERVER_LIBPCIACCESS xf86SetOperatingState(resVga, pTrident->pEnt->index, ResUnusedOpr); |