summaryrefslogtreecommitdiff
path: root/src/i830_accel.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-04-17 15:11:12 -0700
committerEric Anholt <eric@anholt.net>2009-04-27 17:05:59 -0700
commit96df22740b2cdc4f82a4a36c0f77663105d9337e (patch)
treef8017b83ab78a0719b3f2ae2e813e6ae6ee8dd81 /src/i830_accel.c
parentfa81ae1637bfd7b73b43355b78c88a9b84c0393c (diff)
unifdef I830_USE_UXA.
We only have on acceleration architecture now, and you can always build it if you're building the driver.
Diffstat (limited to 'src/i830_accel.c')
-rw-r--r--src/i830_accel.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/i830_accel.c b/src/i830_accel.c
index b185ab17..c2f30a8b 100644
--- a/src/i830_accel.c
+++ b/src/i830_accel.c
@@ -124,9 +124,7 @@ I830WaitLpRing(ScrnInfoPtr pScrn, int n, int timeout_millis)
else
i830_dump_error_state(pScrn);
ErrorF("space: %d wanted %d\n", ring->space, n);
-#ifdef I830_USE_UXA
- pI830->uxa_driver = NULL;
-#endif
+ pI830->uxa_driver = NULL;
FatalError("lockup\n");
}
@@ -283,9 +281,7 @@ I830AccelInit(ScreenPtr pScreen)
switch (pI830->accel) {
case ACCEL_UXA:
-#ifdef I830_USE_UXA
return i830_uxa_init(pScreen);
-#endif
case ACCEL_UNINIT:
case ACCEL_NONE:
break;