From 69884ceccb348404bef471e2e2bfb3fd2f264f55 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@jimmy.(none)>
Date: Fri, 21 Mar 2008 10:13:44 +0000
Subject: [PATCH] Revert "Default to EXA"

This reverts commit cb4e5796f0537ea5e0e646d473930c7b826c85d8.
---
 src/i830_driver.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 6f87c51..637bb44 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1564,17 +1564,17 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
     * If either XAA or EXA (exclusive) is compiled in, default to it.
     * 
     * If both are compiled in, and the user didn't specify noAccel, use the
-    * config option AccelMethod to determine which to use, defaulting to EXA
+    * config option AccelMethod to determine which to use, defaulting to XAA
     * if none is specified, or if the string was unrecognized.
     *
     * All this *could* go away if we removed XAA support from this driver,
     * for example. :)
     */
    if (!pI830->noAccel) {
-#ifdef I830_USE_EXA
-       pI830->useEXA = TRUE;
-#else
+#if (defined(I830_USE_EXA) && defined(I830_USE_XAA)) || !defined(I830_USE_EXA)
        pI830->useEXA = FALSE;
+#else
+       pI830->useEXA = TRUE;
 #endif
 #if defined(I830_USE_XAA) && defined(I830_USE_EXA)
        from = X_DEFAULT;
-- 
1.5.6.5