summaryrefslogtreecommitdiff
path: root/src/mga.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@gmail.com>2012-07-15 19:41:28 +1000
committerDave Airlie <airlied@gmail.com>2012-07-15 19:41:28 +1000
commitf11a407ceb0857bb0d33811511117b490a8ae6ee (patch)
treea11bad19014270c1d7bf4f27a261f3992e4e281c /src/mga.h
parentfa0f3092ed38ce71ba9f65156bde306eb63feaf8 (diff)
mga: fix after XAA removal
Fix mga build after XAA removal. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/mga.h')
-rw-r--r--src/mga.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mga.h b/src/mga.h
index 5856a3f..34695c1 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -20,7 +20,10 @@
#include <stdio.h>
#include "compiler.h"
+#ifdef HAVE_XAA_H
#include "xaa.h"
+#endif
+#include "xf86fbman.h"
#include "exa.h"
#include "xf86Cursor.h"
#include "vgaHW.h"
@@ -554,7 +557,9 @@ typedef struct {
CARD32 MAccess;
int FifoSize;
int StyleLen;
+#ifdef HAVE_XAA_H
XAAInfoRecPtr AccelInfoRec;
+#endif
xf86CursorInfoPtr CursorInfoRec;
DGAModePtr DGAModes;
int numDGAModes;
@@ -715,7 +720,7 @@ void MGAAdjustGranularity(ScrnInfoPtr pScrn, int* x, int* y);
void MGA2064SetupFuncs(ScrnInfoPtr pScrn);
void MGAGSetupFuncs(ScrnInfoPtr pScrn);
-/* #ifdef USE_XAA */
+/*#ifdef USE_XAA */
void MGAStormSync(ScrnInfoPtr pScrn);
void MGAStormEngineInit(ScrnInfoPtr pScrn);
Bool MGAStormAccelInit(ScreenPtr pScreen);