diff -urN -X /home/jgarzik/dontdiff /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/video/clgenfb.c linux_2_4/drivers/video/clgenfb.c
--- /home/jgarzik/tmp/linux-2.4.11-pre6/drivers/video/clgenfb.c	Tue Oct  9 00:04:03 2001
+++ linux_2_4/drivers/video/clgenfb.c	Tue Oct  2 03:47:43 2001
@@ -2707,7 +2707,7 @@
 	}
 
 #elif defined(CONFIG_ZORRO)
-	/* FIXME: CONFIG_PCI and CONFIG_ZORRO may be defined both */
+	/* FIXME: CONFIG_PCI and CONFIG_ZORRO may both be defined */
 	if (clgen_zorro_setup (fb_info, &btype)) {
 		DPRINTK ("EXIT, returning -ENXIO\n");
 		return -ENXIO;