[packages/X11.git] / XFree86-config-s3.patch

--- XFree86-4.1.0/xc/config/cf/xf86site.def.orig	Tue Jul  3 08:44:25 2001
+++ XFree86-4.1.0/xc/config/cf/xf86site.def	Tue Jul  3 08:44:36 2001
@@ -251,7 +251,7 @@
  * will be included in it.  When building the loadable server each of these
  * modules will be built.
  *
-#define XF86CardDrivers		mga glint nv tga s3virge sis rendition \
+#define XF86CardDrivers		mga glint nv tga s3 s3virge sis rendition \
 				neomagic i740 tdfx savage \
 				cirrus vmware tseng trident chips apm \
 				GlideDriver fbdev i128 \
--- XFree86-4.1.0/xc/config/cf/xfree86.cf.orig	Tue Jul  3 10:10:40 2001
+++ XFree86-4.1.0/xc/config/cf/xfree86.cf	Tue Jul  3 10:10:42 2001
@@ -302,7 +302,7 @@
 
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	mga glint nv tga s3virge sis rendition \
+#  define XF86CardDrivers	mga glint nv tga s3 s3virge sis rendition \
 				neomagic i740 tdfx savage \
 				cirrus vmware tseng trident chips apm \
 				GlideDriver fbdev i128 \
@@ -472,7 +472,7 @@
 # endif
 
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	mga glint nv s3virge sis savage \
+#  define XF86CardDrivers	mga glint nv s3 s3virge sis savage \
 				trident chips tdfx fbdev ati \
 				DevelDrivers newport \
 				XF86OSCardDrivers XF86ExtraCardDrivers
@@ -555,7 +555,7 @@
 
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	mga tdfx glint s3virge rendition tga \
+#  define XF86CardDrivers	mga tdfx glint s3 s3virge rendition tga \
 				savage nv DevelDrivers siliconmotion vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
@@ -648,7 +648,7 @@
 
 /* Pure PCI drivers should go first */
 # ifndef XF86CardDrivers
-#  define XF86CardDrivers	mga glint s3virge sis savage\
+#  define XF86CardDrivers	mga glint s3 s3virge sis savage\
 				trident chips tdfx fbdev \
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
Commit	Line	Data
3cccedae	1	--- XFree86-4.1.0/xc/config/cf/xf86site.def.orig Tue Jul 3 08:44:25 2001
	2	+++ XFree86-4.1.0/xc/config/cf/xf86site.def Tue Jul 3 08:44:36 2001
	3	@@ -251,7 +251,7 @@
	4	* will be included in it. When building the loadable server each of these
	5	* modules will be built.
	6	*
	7	-#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
	8	+#define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
	9	neomagic i740 tdfx savage \
	10	cirrus vmware tseng trident chips apm \
	11	GlideDriver fbdev i128 \
	12	--- XFree86-4.1.0/xc/config/cf/xfree86.cf.orig Tue Jul 3 10:10:40 2001
	13	+++ XFree86-4.1.0/xc/config/cf/xfree86.cf Tue Jul 3 10:10:42 2001
	14	@@ -302,7 +302,7 @@
	15
	16	/* Pure PCI drivers should go first */
	17	# ifndef XF86CardDrivers
	18	-# define XF86CardDrivers mga glint nv tga s3virge sis rendition \
	19	+# define XF86CardDrivers mga glint nv tga s3 s3virge sis rendition \
	20	neomagic i740 tdfx savage \
	21	cirrus vmware tseng trident chips apm \
	22	GlideDriver fbdev i128 \
	23	@@ -472,7 +472,7 @@
	24	# endif
	25
	26	# ifndef XF86CardDrivers
	27	-# define XF86CardDrivers mga glint nv s3virge sis savage \
	28	+# define XF86CardDrivers mga glint nv s3 s3virge sis savage \
	29	trident chips tdfx fbdev ati \
	30	DevelDrivers newport \
	31	XF86OSCardDrivers XF86ExtraCardDrivers
	32	@@ -555,7 +555,7 @@
	33
	34	/* Pure PCI drivers should go first */
	35	# ifndef XF86CardDrivers
	36	-# define XF86CardDrivers mga tdfx glint s3virge rendition tga \
	37	+# define XF86CardDrivers mga tdfx glint s3 s3virge rendition tga \
	38	savage nv DevelDrivers siliconmotion vga \
	39	XF86OSCardDrivers XF86ExtraCardDrivers
	40	# endif
	41	@@ -648,7 +648,7 @@
	42
	43	/* Pure PCI drivers should go first */
	44	# ifndef XF86CardDrivers
	45	-# define XF86CardDrivers mga glint s3virge sis savage\
	46	+# define XF86CardDrivers mga glint s3 s3virge sis savage\
	47	trident chips tdfx fbdev \
	48	DevelDrivers vga \
	49	XF86OSCardDrivers XF86ExtraCardDrivers