diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-11 22:37:25 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-07-12 11:59:44 +0100 |
| commit | d25000e1f31e78aff2ab43adb12aec0aac36f56f (patch) | |
| tree | 455c5eb3fdb7b8e217c8f4a08d0ba05aaa81e6ee /src/legacy/i810/i810_driver.c | |
| parent | 44a1528c15eec9b3f93651e779013137864d4d2b (diff) | |
i810: Tidy configure detection for XAA/DGA
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/legacy/i810/i810_driver.c')
| -rw-r--r-- | src/legacy/i810/i810_driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/legacy/i810/i810_driver.c b/src/legacy/i810/i810_driver.c index f4f7f3e3..6fc17bd0 100644 --- a/src/legacy/i810/i810_driver.c +++ b/src/legacy/i810/i810_driver.c @@ -1095,7 +1095,7 @@ DoRestore(ScrnInfoPtr scrn, vgaRegPtr vgaReg, I810RegPtr i810Reg, hwp->writeCrtc(hwp, IO_CTNL, temp); } -#ifdef HAVE_XAA +#ifdef HAVE_XAA_H static void I810SetRingRegs(ScrnInfoPtr scrn) { @@ -1693,7 +1693,7 @@ I810ScreenInit(SCREEN_INIT_ARGS_DECL) } #endif -#ifdef HAVE_DGA +#ifdef HAVE_DGAPROC_H I810DGAInit(screen); #endif @@ -1703,7 +1703,7 @@ I810ScreenInit(SCREEN_INIT_ARGS_DECL) return FALSE; } -#ifdef HAVE_XAA +#ifdef HAVE_XAA_H if (!xf86ReturnOptValBool(pI810->Options, OPTION_NOACCEL, FALSE)) { if (pI810->LpRing->mem.Size != 0) { I810SetRingRegs(scrn); @@ -1943,7 +1943,7 @@ I810LeaveVT(VT_FUNC_ARGS_DECL) } #endif -#ifdef HAVE_XAA +#ifdef HAVE_XAA_H if (pI810->AccelInfoRec != NULL) { I810RefreshRing(scrn); I810Sync(scrn); @@ -1968,12 +1968,12 @@ I810CloseScreen(CLOSE_SCREEN_ARGS_DECL) ScrnInfoPtr scrn = xf86ScreenToScrn(screen); vgaHWPtr hwp = VGAHWPTR(scrn); I810Ptr pI810 = I810PTR(scrn); -#ifdef HAVE_XAA +#ifdef HAVE_XAA_H XAAInfoRecPtr infoPtr = pI810->AccelInfoRec; #endif if (scrn->vtSema == TRUE) { -#ifdef HAVE_XAA +#ifdef HAVE_XAA_H if (pI810->AccelInfoRec != NULL) { I810RefreshRing(scrn); I810Sync(scrn); @@ -2004,7 +2004,7 @@ I810CloseScreen(CLOSE_SCREEN_ARGS_DECL) pI810->ScanlineColorExpandBuffers = NULL; } -#ifdef HAVE_XAA +#ifdef HAVE_XAA_H if (infoPtr) { if (infoPtr->ScanlineColorExpandBuffers) free(infoPtr->ScanlineColorExpandBuffers); |