Index: src/radeon.h
===================================================================
RCS file: /cvs/xorg/driver/xf86-video-ati/src/radeon.h,v
retrieving revision 1.31
diff -u -r1.31 radeon.h
--- src/radeon.h	9 Nov 2005 07:30:03 -0000	1.31
+++ src/radeon.h	6 Jan 2006 15:58:36 -0000
@@ -41,6 +41,7 @@
 #include "xf86str.h"
 #include "xf86_ansic.h"
 #include "compiler.h"
+#include "xf86fbman.h"
 
 				/* PCI support */
 #include "xf86Pci.h"
@@ -50,7 +51,6 @@
 #endif
 #ifdef USE_XAA
 #include "xaa.h"
-#include "xf86fbman.h"
 #endif
 
 				/* Exa and Cursor Support */
@@ -399,14 +399,14 @@
 
 #ifdef USE_EXA
     ExaDriverRec      exa;
-#endif
-#ifdef USE_XAA
-    XAAInfoRecPtr     accel;
     int               engineMode;
 #define EXA_ENGINEMODE_UNKNOWN 0
 #define EXA_ENGINEMODE_2D      1
 #define EXA_ENGINEMODE_3D      2
 #endif
+#ifdef USE_XAA
+    XAAInfoRecPtr     accel;
+#endif
     Bool              accelOn;
     xf86CursorInfoPtr cursor;
 #ifdef USE_EXA