4 files changed, 10 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index fc741e01e..d214163d5 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 1.1.4.3 2003/12/18 19:29:13 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
 
 
@@ -1060,13 +1060,13 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
 
 #ifdef XINERAMA
     from = X_DEFAULT;
-    if (!noXineramaExtension)
+    if (!noPanoramiXExtension)
       from = X_CMDLINE;
     else if (xf86GetOptValBool(FlagOptions, FLAG_XINERAMA, &value)) {
-      noXineramaExtension = !value;
+      noPanoramiXExtension = !value;
       from = X_CONFIG;
     }
-    if (!noXineramaExtension)
+    if (!noPanoramiXExtension)
       xf86Msg(from, "Xinerama: enabled\n");
 #endif
 
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index dce27fa63..21552d485 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
 /*
  * Copyright (c) 1998-2002 by The XFree86 Project, Inc.
@@ -141,7 +141,7 @@ DGAInit(
 	modes[i].num = i + 1;
 
 #ifdef XINERAMA
-     if(!noXineramaExtension)
+     if(!noPanoramiXExtension)
 	for(i = 0; i < num; i++)
 	    modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
 #endif
diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c
index 392229ce9..ab428e0b0 100644
--- a/hw/xfree86/common/xf86Mode.c
+++ b/hw/xfree86/common/xf86Mode.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.1.4.2 2003/12/18 19:29:13 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -1683,7 +1683,7 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 #ifdef RANDR
     if (!xf86Info.disableRandR	
 #ifdef XINERAMA
-	&& noXineramaExtension
+	&& noPanoramiXExtension
 #endif
 	)
 	validateAllDefaultModes = TRUE;
diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
index 165ddf771..d98f36f1c 100644
--- a/hw/xfree86/common/xf86RandR.c
+++ b/hw/xfree86/common/xf86RandR.c
@@ -1,4 +1,4 @@
-/* $XdotOrg$ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.1.4.2 2003/12/18 19:29:14 kaleb Exp $ */
 /*
  * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
  *
@@ -246,7 +246,7 @@ xf86RandRInit (ScreenPtr    pScreen)
     
 #ifdef XINERAMA
     /* XXX disable RandR when using Xinerama */
-    if (!noXineramaExtension)
+    if (!noPanoramiXExtension)
 	return TRUE;
 #endif
     if (xf86RandRGeneration != serverGeneration)