--- xf86site.def.orig	Wed Jun  4 08:53:23 1997
+++ xf86site.def	Mon Sep 22 01:02:42 1997
@@ -90,44 +90,47 @@
 #define XF86SVGAServer		YES
 
 /* The 16-colour VGA server */
-#define XF86VGA16Server		YES
+#define XF86VGA16Server		NO
+
 
 /* Dual headed 16-colour VGA + mono server */
-#define XF86VGA16DualServer	YES
+#define XF86VGA16DualServer	NO
+
 
 /* The VGA mono server */
-#define XF86MonoServer		YES
+#define XF86MonoServer		NO
+
 
 /* Dual headed VGA mono server */
-#define XF86MonoDualServer	YES
+#define XF86MonoDualServer	NO
 
 /* The S3 servers */
-#define XF86S3Server		YES
-#define XF86S3VServer		YES
+#define XF86S3Server		NO
+#define XF86S3VServer		NO
 
 /* The IBM 8514/A server */
-#define XF86I8514Server		YES
+#define XF86I8514Server		NO
 
 /* The Mach8 server */
-#define XF86Mach8Server		YES
+#define XF86Mach8Server		NO
 
 /* The Mach32 server */
-#define XF86Mach32Server	YES
+#define XF86Mach32Server	NO
 
 /* The Mach64 server */
-#define XF86Mach64Server	YES
+#define XF86Mach64Server	NO
 
 /* The P9000 server */
-#define XF86P9000Server		YES
+#define XF86P9000Server		NO
 
 /* The AGX server */
-#define XF86AGXServer		YES
+#define XF86AGXServer		NO
 
 /* The W32 server */
-#define XF86W32Server		YES
+#define XF86W32Server		NO
 
 /* The I128 server */
-#define XF86I128Server		YES
+#define XF86I128Server		NO
 
 /* The TGA server */
 #define XF86TGAServer		NO
@@ -138,22 +141,22 @@
 /*
  * PC98 X servers
  *
-#define XF98EGCServer		YES
-#define XF98GANBWAPServer	YES
-#define XF98NEC480Server	YES
-#define XF98NKVNECServer	YES
-#define XF98WABSServer		YES
-#define XF98WABEPServer		YES
-#define XF98WSNAServer		YES
-#define XF98TGUIServer		YES
-#define XF98NECS3Server		YES
-#define XF98PWSKBServer		YES
-#define XF98PWLBServer		YES
-#define XF98GA968Server		YES
+#define XF98EGCServer		NO
+#define XF98GANBWAPServer	NO
+#define XF98NEC480Server	NO
+#define XF98NKVNECServer	NO
+#define XF98WABSServer		NO
+#define XF98WABEPServer		NO
+#define XF98WSNAServer		NO
+#define XF98TGUIServer		NO
+#define XF98NECS3Server		NO
+#define XF98PWSKBServer		NO
+#define XF98PWLBServer		NO
+#define XF98GA968Server		NO
  */
 
 /* Xnest server */
-#define XnestServer		YES
+#define XnestServer		NO
 
 /*
  * Set the default server (ie the one that gets the sym-link to "X")
@@ -161,17 +164,15 @@
 #define ServerToInstall	XF86_S3
  */
 
-#define XF86SvgaDrivers		nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
-				cirrus ncr77c22 mga oak al2101 ali cl64xx \
-				video7 chips ark mx realtek apm generic
+#define XF86SvgaDrivers		cirrus generic
 
-#define XF86Vga16Drivers	/*et4000*/ et3000 ncr77c22 ati sis tvga8900 oak \
+#define XF86Vga16Drivers	et4000 et3000 ncr77c22 ati sis tvga8900 oak \
 				cl64xx generic 
 
-#define XF86Vga2Drivers		/*et4000*/ et3000 pvga1 gvga ati sis tvga8900 \
-				/*cirrus*/ ncr77c22 oak cl64xx generic
+#define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati sis tvga8900 \
+				cirrus ncr77c22 oak cl64xx generic
 
-#define XF86MonoDrivers		hgc1280 sigma apollo hercules
+#define XF86MonoDrivers		hgc1280 sigma apollo
 
 #define XF86W32Drivers		et4000w32
 
--- drivers/vga256/cirrus/cir_driver.c.orig	Wed Jun  4 08:52:00 1997
+++ drivers/vga256/cirrus/cir_driver.c	Mon Sep 22 01:04:29 1997
@@ -3304,7 +3304,7 @@
 	}
 				/* Always use VLCK3 */
       
-      new->std.MiscOutReg |= 0x0C;
+      new->std.MiscOutReg &= 0xF3;
 
       if (!cirrusCheckClock(cirrusChip, new->std.NoClock))
 	return (FALSE);