diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-28 13:32:38 +1000 |
| commit | 7149d16ed17c064cc91cb1473f10e8e80055347c (patch) | |
| tree | e2fd84278b2a517c929f789235f259cc51bc3821 | |
| parent | b656f6522f287efb8595509c678ce6ec60843944 (diff) | |
tdfx: update for resources/RAC API removal
| -rw-r--r-- | src/tdfx_driver.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c index 76ffa51..a3435f5 100644 --- a/src/tdfx_driver.c +++ b/src/tdfx_driver.c @@ -54,8 +54,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include "xf86.h" #include "xf86_OSproc.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86Resources.h" #include "xf86RAC.h" +#endif #include "vbe.h" #include "xf86cmap.h" @@ -855,10 +857,12 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags) pTDFX->Primary = xf86IsPrimaryPci(pTDFX->PciInfo); #endif +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pTDFX->pEnt->index, NULL, ResExclusive)) { TDFXFreeRec(pScrn); return FALSE; } + /* * We don't need VGA resources during OPERATING state. However I'm * not sure if they are disabled. @@ -876,7 +880,7 @@ TDFXPreInit(ScrnInfoPtr pScrn, int flags) pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; } else pScrn->racMemFlags = 0; - +#endif /* Set pScrn->monitor */ pScrn->monitor = pScrn->confScreen->monitor; |