Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.365.2.147
diff -u -2 -0 -r1.365.2.147 ChangeLog
--- xc/ChangeLog	2 Feb 2005 03:22:36 -0000	1.365.2.147
+++ xc/ChangeLog	2 Feb 2005 03:32:42 -0000
@@ -1,21 +1,28 @@
 2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
+	* xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
+	Backout of Bugzilla #2206 (https://bugs.freedesktop.org/show_bug.cgi?id=2206)
+	attachment #1622 (https://bugs.freedesktop.org/attachment.cgi?id=1622)
+	as this patch does not work for the branch and causes build failure.
+	Approved in the 2005-01-31 Xorg release-wranglers phone call.
+
+2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/programs/Xserver/hw/xfree86/drivers/sis/sis.h
 	Bugzilla #2438 (https://bugs.freedesktop.org/show_bug.cgi?id=2438)
 	attachment #1806 (https://bugs.freedesktop.org/attachment.cgi?id=1806):
 	Fix sis driver to work correctly on AMD64.
 	Patch by Thomas Winischhofer <thomas@winischhofer.net>.
 	Vouchers for commit into X11R6.8.x stable branch are Kevin E.
 	Martin <kem@freedesktop.org> and Roland Mainz
 	<roland.mainz@nrubsig.org>.
 
 2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
 	* xc/programs/Xserver/hw/xfree86/drivers/sis/init301.c
 	Bugzilla #2437 (https://bugs.freedesktop.org/show_bug.cgi?id=2437)
 	attachment #1805 (https://bugs.freedesktop.org/attachment.cgi?id=1805):
 	Fix sis driver which was reading wrong data from BIOS image.
 	Patch by Thomas Winischhofer <thomas@winischhofer.net>.
 	Vouchers for commit into X11R6.8.x stable branch are Kevin E.
 	Martin <kem@freedesktop.org> and Roland Mainz
 	<roland.mainz@nrubsig.org>.
 
 2005-02-01 Roland Mainz <roland.mainz@nrubsig.org>
Index: xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c,v
retrieving revision 1.6.2.2
diff -u -2 -0 -r1.6.2.2 xorgconfig.c
--- xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	12 Jan 2005 20:09:51 -0000	1.6.2.2
+++ xc/programs/Xserver/hw/xfree86/xf86config/xorgconfig.c	2 Feb 2005 03:32:54 -0000
@@ -1721,41 +1721,41 @@
 			printf("Clocks %s\n", clks);
 			config_numberofclockslines++;
 		}
 		fclose(f);
 clocksprobefailed:
                 unlink(d3name);
                 unlink(d2name);
                 unlink(fname);
 		printf("\n");
 
 endofprobeonly:
 		keypress();
 	}
 skipclockprobing:
 #endif
 
 	/*
 	 * For vga driver, no further configuration is required.
 	 */
 	if (card_selected == -1 || (card[card_selected].flags & UNSUPPORTED))
-		return (0);
+		return;
 	
 	/*
 	 * Configure the modes order.
 	 */
 	config_virtual = 0;
 	for (;;) {
 	 	char modes[128];
 
 		emptylines();
 
 		printf("%s", modesorderintro_text);
 		printf("%s for 8-bit\n", config_modesline8bpp);
 		printf("%s for 16-bit\n", config_modesline16bpp);
 		printf("%s for 24-bit\n", config_modesline24bpp);
 		printf("\n");
 		printf("%s", modesorder_text2);
 
 		printf("Enter your choice: ");
 		getstring(s);
 		printf("\n");