--- src/mga_driver.c.orig	2007-10-02 15:11:28.000000000 -0600
+++ src/mga_driver.c	2009-02-01 11:23:12.000000000 -0700
@@ -96,8 +96,6 @@
 #include "shadowfb.h"
 #include "fbdevhw.h"
 
-#include "cfb8_32.h"
-
 #ifdef XF86DRI
 #include "dri.h"
 #endif
@@ -339,12 +337,6 @@
     NULL
 };
 
-static const char *xf8_32bppSymbols[] = {
-    "cfb8_32ScreenInit",
-    "xf86Overlay8Plus32Init",
-    NULL
-};
-
 #ifdef USE_EXA
 static const char *exaSymbols[] = {
     "exaDriverInit",
@@ -529,8 +521,8 @@
 #ifdef USE_EXA
                           exaSymbols,
 #endif
-			  xf8_32bppSymbols, ramdacSymbols,
-			  ddcSymbols, i2cSymbols, shadowSymbols,
+			  ramdacSymbols, ddcSymbols,
+			  i2cSymbols, shadowSymbols,
 			  fbdevHWSymbols, vbeSymbols,
 			  fbSymbols, int10Symbols,
 #ifdef XF86DRI
@@ -2225,11 +2217,7 @@
 
     /* Load the required framebuffer */
     if (pMga->Overlay8Plus24) {
-	if (!xf86LoadSubModule(pScrn, "xf8_32bpp")) {
-	    MGAFreeRec(pScrn);
-	    return FALSE;
-	}
-	xf86LoaderReqSymLists(xf8_32bppSymbols, NULL);
+	return FALSE;
     } else {
 	if (!xf86LoadSubModule(pScrn, "fb")) {
 	    MGAFreeRec(pScrn);
@@ -2680,11 +2668,7 @@
 
     /* All MGA support DirectColor and can do overlays in 32bpp */
     if(pMga->Overlay8Plus24 && (pScrn->bitsPerPixel == 32)) {
-	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
-			      pScrn->rgbBits, PseudoColor))
-		return FALSE;
-	if (!miSetVisualTypes(24, TrueColorMask, pScrn->rgbBits, TrueColor))
-		return FALSE;
+	return FALSE;
     } else if (pMga->SecondCrtc) {
 	/* No DirectColor on the second head */
 	if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits,
@@ -2774,16 +2758,9 @@
 #endif
 
 
-    if (pMga->Overlay8Plus24) {
-	ret = cfb8_32ScreenInit(pScreen, FBStart,
-			width, height,
+    ret = fbScreenInit(pScreen, FBStart, width, height,
 			pScrn->xDpi, pScrn->yDpi,
-			displayWidth);
-    } else {
-	ret = fbScreenInit(pScreen, FBStart, width, height,
-			   pScrn->xDpi, pScrn->yDpi,
-			   displayWidth, pScrn->bitsPerPixel);
-    }
+			displayWidth, pScrn->bitsPerPixel);
 
     if (!ret)
 	return FALSE;
@@ -2805,8 +2782,7 @@
     }
 
     /* must be after RGB ordering fixed */
-    if (!pMga->Overlay8Plus24)
-	fbPictureInit (pScreen, 0, 0);
+    fbPictureInit (pScreen, 0, 0);
     
     xf86SetBlackWhitePixels(pScreen);
 
@@ -2869,11 +2845,6 @@
 	NULL, f))
 	return FALSE;
 
-    if(pMga->Overlay8Plus24) { /* Must come after colormap initialization */
-	if(!xf86Overlay8Plus32Init(pScreen))
-	    return FALSE;
-    }
-
     if(pMga->ShadowFB) {
 	RefreshAreaFuncPtr refreshArea = MGARefreshArea;