[PATCH video-chips 2/3] config: remove MFB usage as it is no longer in xserver

[Gaetan Nadon]

As of commit f31bd087e8a7f65cd588bd1d022bb18e72b2a60c
dated August 2007, xfree86 xf1bpp and xf4bpp have been removed
from the xserver.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 configure.ac    |    2 --
 src/ct_driver.c |   44 --------------------------------------------
 2 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4f0d80b..2dc59d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,6 @@ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
 AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
               [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
               [#include "xorg-server.h"])
-AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
-AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
 CPPFLAGS="$SAVE_CPPFLAGS"
 
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
diff --git a/src/ct_driver.c b/src/ct_driver.c
index 19aa689..3e921e3 100644
--- a/src/ct_driver.c
+++ b/src/ct_driver.c
@@ -109,14 +109,6 @@
 #include "cfb8_16.h"
 
 
-/* Needed for the 1 and 4 bpp framebuffers */
-#ifdef HAVE_XF1BPP
-#include "xf1bpp.h"
-#endif
-#ifdef HAVE_XF4BPP
-#include "xf4bpp.h"
-#endif
-
 /* int10 */
 #include "xf86int10.h"
 #include "vbe.h"
@@ -1164,26 +1156,6 @@ CHIPSPreInit(ScrnInfoPtr pScrn, int flags)
 
     /* Load bpp-specific modules */
     switch (pScrn->bitsPerPixel) {
-#ifdef HAVE_XF1BPP
-    case 1:
-	if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
-	    vbeFree(cPtr->pVbe);
-	    cPtr->pVbe = NULL;
-	    CHIPSFreeRec(pScrn);
-	    return FALSE;
-	}	
-	break;
-#endif
-#ifdef HAVE_XF4BPP
-    case 4:
-	if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
-	    vbeFree(cPtr->pVbe);
-	    cPtr->pVbe = NULL;
-	    CHIPSFreeRec(pScrn);
-	    return FALSE;
-	}	
-	break;
-#endif
     case 16:
 	if (cPtr->Flags & ChipsOverlay8plus16) {
 	    if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
@@ -3914,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
     }
 
     switch (pScrn->bitsPerPixel) {
-#ifdef HAVE_XF1BPP
-    case 1:
-	ret = xf1bppScreenInit(pScreen, FBStart,
- 		        width,height,
-			pScrn->xDpi, pScrn->yDpi,
-			displayWidth);
-	break;
-#endif
-#ifdef HAVE_XF4BPP
-    case 4:
-	ret = xf4bppScreenInit(pScreen, FBStart,
- 		        width,height,
-			pScrn->xDpi, pScrn->yDpi,
-			displayWidth);
-	break;
-#endif
     case 16:
       if (cPtr->Flags & ChipsOverlay8plus16) {
 	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
-- 
1.6.0.4