4 files changed, 11 insertions, 11 deletions
diff --git a/util/AsmMacros.h b/util/AsmMacros.h
index feb5ce0..98e0b04 100644
--- a/util/AsmMacros.h
+++ b/util/AsmMacros.h
@@ -57,7 +57,7 @@
  *
  */
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/AsmMacros.h,v 1.1 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86$ */
 
 #if defined(__GNUC__)
 #if defined(linux) && (defined(__alpha__) || defined(__ia64__))
@@ -438,13 +438,13 @@ void outl(U16_t, U32_t);
 #   define __USLC__
 #  endif
 # endif
-#ifndef SCO325
-# include <sys/inline.h>
-#else
-# include "../common/scoasm.h"
-#endif
-#define intr_disable() asm("cli")
-#define intr_enable()  asm("sti")
+# ifndef __SCO__
+#  include <sys/inline.h>
+# else
+#  include "../common/scoasm.h"
+# endif
+# define intr_disable() asm("cli")
+# define intr_enable()  asm("sti")
 
 #endif /* _MINIX and _ACK */
 #endif /* __GNUC__ */
diff --git a/util/dRegs.c b/util/dRegs.c
index 0c8ee62..51a384b 100644
--- a/util/dRegs.c
+++ b/util/dRegs.c
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.9 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.8 2001/10/01 13:44:04 eich Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>
diff --git a/util/mRegs.c b/util/mRegs.c
index 4d8da11..b1688de 100644
--- a/util/mRegs.c
+++ b/util/mRegs.c
@@ -4,7 +4,7 @@
 
 
 
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.5 2000/10/23 12:10:13 alanh Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>
diff --git a/util/modClock.c b/util/modClock.c
index cce4f84..48a1961 100644
--- a/util/modClock.c
+++ b/util/modClock.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.6 2001/11/16 21:13:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.5 2001/05/09 19:57:06 dbateman Exp $ */
 
 #ifdef __NetBSD__
 #  include <sys/types.h>