summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2005-01-11 14:59:01 +0000
committerEgbert Eich <eich@suse.de>2005-01-11 14:59:01 +0000
commitdd6f9662351a9321bd5712126bc3d1c2bfa9e538 (patch)
tree1b4538b401fbaa3bd1bb93f163efb525f69cf29f
parent0df4096ad73b6cb7d414c7eac715ad9af3087f9f (diff)
Minor format fix.
Added explanatory comment and debug code. Added comment.
-rw-r--r--xorg.cf33
1 files changed, 21 insertions, 12 deletions
diff --git a/xorg.cf b/xorg.cf
index 75a5970..e775435 100644
--- a/xorg.cf
+++ b/xorg.cf
@@ -1,4 +1,4 @@
-XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.36 2005/01/10 18:38:30 eich Exp $
+XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.37 2005/01/10 19:18:59 eich Exp $
/*
* This configuration file contains all of the configuration
* information for the Xorg based X Servers.
@@ -411,12 +411,15 @@ RELEASE_VERSION = ReleaseVersion
# ifndef DriDrivers
# ifndef ia64Architecture
-# define i386DRIDrivers i810 i915
+# define i386DRIDrivers i810 i915 sis tdfx
# else
+ /*
+ * The tdfx driver needs Glide, which is not available for IA64.
+ * SiS is 64-bit unclean as of this writing.
+ */
# define i386DRIDrivers /**/
# endif
-# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200 \
- sis tdfx
+# define DriDrivers gamma i386DRIDrivers mga r128 radeon r200
# endif
#endif /* i386Architecture || ia64Architecture */
@@ -451,11 +454,13 @@ RELEASE_VERSION = ReleaseVersion
XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers
# endif
-/* The tdfx driver needs Glide, which is not available for AMD64. SiS is 64-bit
- * unclean as of this writing.
+/*
+ * The tdfx driver needs Glide, which is not available for AMD64.
+ * SiS is 64-bit unclean as of this writing.
*/
-# define DriDrivers i915 gamma mga r128 radeon r200
-
+# ifndef DriDrivers
+# define DriDrivers i915 gamma mga r128 radeon r200
+# endif
#endif /*AMD64Arcitecture*/
/* SPARC and UltraSPARC drivers */
@@ -589,9 +594,12 @@ RELEASE_VERSION = ReleaseVersion
savage nv cirrus DevelDrivers siliconmotion \
vga XF86OSCardDrivers XF86ExtraCardDrivers
# endif
-/* SiS is 64-bit unclean as of this writing. */
+/*
+ * The tdfx driver needs Glide, which is not available for Alpha.
+ * SiS is 64-bit unclean as of this writing.
+ */
# ifndef DriDrivers
-# define DriDrivers gamma tdfx mga r128 radeon r200
+# define DriDrivers gamma mga r128 radeon r200
# endif
#endif /* AlphaArchitecture */
@@ -623,10 +631,11 @@ RELEASE_VERSION = ReleaseVersion
DevelDrivers vga \
XF86OSCardDrivers XF86ExtraCardDrivers
# endif
+/* The tdfx driver needs Glide, which is not available for PPC. */
# ifndef DriDrivers
-# define DriDrivers gamma tdfx mga r128 radeon r200
+# define DriDrivers gamma mga r128 radeon r200
# endif
-#endif
+#endif /* PpcArchitecture || Mc68020Architecture */
/*
* Intel StrongARM and Hewlett-Packard PA-RISC