summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-01-25 22:53:12 +0000
committerAdam Jackson <ajax@nwnk.net>2006-01-25 22:53:12 +0000
commit214eb92d43214e206cdb38e72ae0f5c667b5d29f (patch)
tree5f056f90941b2a16ec5ed4a4ee4ecae8bfb50ad8
parent19dd5927079ac262d45660907f336e8838bad374 (diff)
Remove xf8_32wid damage, it is going away.
-rw-r--r--ChangeLog7
-rw-r--r--src/ffb_bcopy.c1
-rw-r--r--src/ffb_circle.c1
-rw-r--r--src/ffb_driver.c5
4 files changed, 7 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a1471c6..2953af4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-25 Adam Jackson <ajax@freedesktop.org>
+
+ * src/ffb_bcopy.c:
+ * src/ffb_circle.c:
+ * src/ffb_driver.c:
+ Remove xf8_32wid damage, it is going away.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/ffb_bcopy.c b/src/ffb_bcopy.c
index 5737fbd..e077965 100644
--- a/src/ffb_bcopy.c
+++ b/src/ffb_bcopy.c
@@ -41,7 +41,6 @@
#include "cfb.h"
#undef PSZ
#include "cfb32.h"
-#include "cfb8_32wid.h"
#ifdef FFB_BLOCKCOPY_IMPLEMENTED
/* Due to VIS based copyarea and ffb rop vertscroll being significantly faster
diff --git a/src/ffb_circle.c b/src/ffb_circle.c
index 3469e9e..ee71ad5 100644
--- a/src/ffb_circle.c
+++ b/src/ffb_circle.c
@@ -41,7 +41,6 @@
#include "cfb.h"
#undef PSZ
#include "cfb32.h"
-#include "cfb8_32wid.h"
#include "mi.h"
#include "mifillarc.h"
diff --git a/src/ffb_driver.c b/src/ffb_driver.c
index 215c0cd..3bb8cdd 100644
--- a/src/ffb_driver.c
+++ b/src/ffb_driver.c
@@ -411,11 +411,6 @@ FFBPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
}
- if (xf86LoadSubModule(pScrn, "xf8_32wid") == NULL) {
- FFBFreeRec(pScrn);
- return FALSE;
- }
-
if (xf86LoadSubModule(pScrn, "fb") == NULL) {
FFBFreeRec(pScrn);
return FALSE;