--- trident_dga.c.original	2012-11-23 09:10:39.000000000 +0100
+++ trident_dga.c	2012-11-23 09:10:24.000000000 +0100
@@ -35,11 +35,13 @@
 
 
 static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, 
 					int *, int *, int *);
 static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
+#ifdef HAVE_XAA_H
 static void TRIDENT_Sync(ScrnInfoPtr);
+#endif
 static int  TRIDENT_GetViewport(ScrnInfoPtr);
 static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
 #ifdef HAVE_XAA_H
 static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
 static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
@@ -54,21 +56,21 @@
    TRIDENT_OpenFramebuffer,
    NULL,
    TRIDENT_SetMode,
    TRIDENT_SetViewport,
    TRIDENT_GetViewport,
-   TRIDENT_Sync,
 #ifdef HAVE_XAA_H
+   TRIDENT_Sync,
    TRIDENT_FillRect,
    TRIDENT_BlitRect,
 #if 0
    TRIDENT_BlitTransRect
 #else
    NULL
 #endif
 #else
-   NULL, NULL, NULL
+   NULL, NULL, NULL, NULL
 #endif
 };
 
 Bool
 TRIDENTDGAInit(ScreenPtr pScreen)
@@ -237,20 +239,22 @@
 	(*pTrident->AccelInfoRec->SubsequentSolidFillRect)(pScrn, x, y, w, h);
 	SET_SYNC_FLAG(pTrident->AccelInfoRec);
     }
 }
 
+#ifdef HAVE_XAA_H
 static void 
 TRIDENT_Sync(
    ScrnInfoPtr pScrn
 ){
     TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
 
     if(pTrident->AccelInfoRec) {
 	(*pTrident->AccelInfoRec->Sync)(pScrn);
     }
 }
+#endif
 
 static void 
 TRIDENT_BlitRect(
    ScrnInfoPtr pScrn, 
    int srcx, int srcy,