xf86-video-r128: Branch 'master'

[Michel Dänzer]

 src/r128_cursor.c |    2 ++
 src/r128_driver.c |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit f83ee3144236bcca35eeadee2924e8bc15092447
Author: Connor Behan <connor.behan at gmail.com>
Date:   Tue Jul 17 22:53:17 2012 -0700

    Fix build without EXA
    
    The offscreen area used by EXA needs to be declared even with lazy
    evaluation.
    
    Signed-off-by: Connor Behan <connor.behan at gmail.com>

diff --git a/src/r128_cursor.c b/src/r128_cursor.c
index 974a6d5..b76913c 100644
--- a/src/r128_cursor.c
+++ b/src/r128_cursor.c
@@ -261,6 +261,8 @@ Bool R128CursorInit(ScreenPtr pScreen)
     FBAreaPtr             fbarea  = NULL;
 #ifdef USE_EXA
     ExaOffscreenArea*	  osArea  = NULL;
+#else
+    void*		  osArea  = NULL;
 #endif
     int                   width;
     int                   height;
diff --git a/src/r128_driver.c b/src/r128_driver.c
index f4a5e1b..ae16e97 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2244,6 +2244,8 @@ Bool R128ScreenInit(SCREEN_INIT_ARGS_DECL)
     Bool	noAccel;
 #ifdef USE_EXA
     ExaOffscreenArea*     osArea = NULL;
+#else
+    void*		  osArea = NULL;
 #endif
     char *optstr;