From f11a407ceb0857bb0d33811511117b490a8ae6ee Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 15 Jul 2012 19:41:28 +1000 Subject: mga: fix after XAA removal Fix mga build after XAA removal. Signed-off-by: Dave Airlie --- src/mga_driver.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/mga_driver.c') diff --git a/src/mga_driver.c b/src/mga_driver.c index e50d77b..b3fe538 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -90,7 +90,7 @@ #include "mga_macros.h" #include "mga_maven.h" -#ifdef USE_XAA +#ifdef XAA #include "xaa.h" #endif @@ -2118,7 +2118,7 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) } } else { #endif -#ifdef USE_XAA +#ifdef XAA if (!xf86LoadSubModule(pScrn, "xaa")) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n"); @@ -3401,8 +3401,10 @@ MGAScreenInit(SCREEN_INIT_ARGS_DECL) mgaExaInit(pScreen); else #endif -#ifdef USE_XAA +#ifdef XAA MGAStormAccelInit(pScreen); +#else + ; #endif } @@ -3771,7 +3773,7 @@ MGACloseScreen(CLOSE_SCREEN_ARGS_DECL) pMgaEnt->refCount--; } -#ifdef USE_XAA +#ifdef XAA if (pMga->AccelInfoRec) XAADestroyInfoRec(pMga->AccelInfoRec); #endif -- cgit v1.2.3