xf86-video-intel: Branch 'glucose' - src/i830_memory.c src/i830_video.c

[Alan Hourihane]

 src/i830_memory.c |    2 +-
 src/i830_video.c  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree fcabb68708f4b299fe251577d04d6cfb84100bda (from 59580cd3bae179011a4df0ecaeed1abdd739299f)
Author: Alan Hourihane <alanh at localhost.(none)>
Date:   Tue Sep 11 16:03:18 2007 +0100

    Fix build problems.

diff --git a/src/i830_memory.c b/src/i830_memory.c
index 22a9619..7059bd5 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -877,7 +877,7 @@ i830_allocate_framebuffer(ScrnInfoPtr pS
      * acceleration operations (non-XY COLOR_BLT) can't be done to tiled
      * buffers.
      */
-    if (!pI830->useEXA && IS_I965G(pI830))
+    if (!(pI830->AccelMethod == USE_EXA) && IS_I965G(pI830))
 	tiling = FALSE;
     else
 	tiling = pI830->tiling;
diff --git a/src/i830_video.c b/src/i830_video.c
index 2128eb8..e9a65ad 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -2396,7 +2396,7 @@ I830PutImage(ScrnInfoPtr pScrn,
     }
 
 #ifdef I830_USE_EXA
-    if (pI830->useEXA) {
+    if (pI830->AccelMethod == USE_EXA) {
 	/* Force the pixmap into framebuffer so we can draw to it. */
 	exaMoveInPixmap(pPixmap);
     }