--- xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c.dist	2004-04-23 12:53:24.000000000 -0700
+++ xc/programs/Xserver/hw/xfree86/drivers/vga/generic.c	2005-06-04 20:28:50.366285187 -0700
@@ -1424,6 +1424,7 @@
 #endif
 		ShadowFBInit(pScreen, GenericRefreshArea1bpp);
 	    }
+#if defined(XF1Bpp) || defined(XF4Bpp)
 	    else
 	    {
 		Inited = xf1bppScreenInit(pScreen, pvgaHW->Base,
@@ -1432,6 +1433,7 @@
 					  pScreenInfo->xDpi, pScreenInfo->yDpi,
 					  pScreenInfo->displayWidth);
 	    }
+#endif
 	    break;
 	case 4:
 	    if (pGenericPriv->ShadowFB)
@@ -1456,6 +1458,7 @@
 #endif
 		ShadowFBInit(pScreen, GenericRefreshArea4bpp);
 	    }
+#ifdef XF4Bpp
 	    else
 	    {
 		Inited = xf4bppScreenInit(pScreen, pvgaHW->Base,
@@ -1464,6 +1467,7 @@
 					  pScreenInfo->xDpi, pScreenInfo->yDpi,
 					  pScreenInfo->displayWidth);
 	    }
+#endif
 	    break;
 	case 8:
 	    Inited = fbScreenInit(pScreen, pvgaHW->Base,