xserver: Branch 'master' - 2 commits

[Dave Airlie]

 exa/exa.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 8dc8812c226222fc64f8e489f9f123687a95d3d1
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Apr 23 12:13:35 2009 +1000

    exa: add missing exa.h header include

diff --git a/exa/exa.h b/exa/exa.h
index 9d9fb35..3e1f1c7 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -39,7 +39,7 @@
 #include "fb.h"
 
 #define EXA_VERSION_MAJOR   2
-#define EXA_VERSION_MINOR   4
+#define EXA_VERSION_MINOR   5
 #define EXA_VERSION_RELEASE 0
 
 typedef struct _ExaOffscreenArea ExaOffscreenArea;
@@ -704,10 +704,9 @@ typedef struct _ExaDriver {
                               int depth, int bitsPerPixel, int devKind,
                               pointer pPixData);
 
-    /** @} */
     void *(*CreatePixmap2)(ScreenPtr pScreen, int width, int height,
-                           int depth, int usage_hint, int bitsPerPixel);
-
+			   int depth, int usage_hint, int bitsPerPixel);
+    /** @} */
 } ExaDriverRec, *ExaDriverPtr;
 
 /** @name EXA driver flags
commit 3ec6a121e110ba3cae964ee201d4d5bf818b6dff
Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Apr 23 12:13:05 2009 +1000

    exa: missed exa.h change

diff --git a/exa/exa.h b/exa/exa.h
index d7219f0..9d9fb35 100644
--- a/exa/exa.h
+++ b/exa/exa.h
@@ -705,6 +705,9 @@ typedef struct _ExaDriver {
                               pointer pPixData);
 
     /** @} */
+    void *(*CreatePixmap2)(ScreenPtr pScreen, int width, int height,
+                           int depth, int usage_hint, int bitsPerPixel);
+
 } ExaDriverRec, *ExaDriverPtr;
 
 /** @name EXA driver flags