diff -urN xc.orig/programs/Xserver/hw/xfree86/common/compiler.h xc/programs/Xserver/hw/xfree86/common/compiler.h
--- xc.orig/programs/Xserver/hw/xfree86/common/compiler.h	2004-08-27 12:27:12.000000000 -0700
+++ xc/programs/Xserver/hw/xfree86/common/compiler.h	2004-12-19 15:09:18.599511056 -0800
@@ -1076,7 +1076,12 @@
 
 extern volatile unsigned char *ioBase;
 
-#    define eieio()		__asm__ __volatile__ ("eieio" ::: "memory")
+#if defined(linux)
+# include <asm/memory.h>
+#endif /* defined(linux) */
+#ifndef eieio /* We deal with arch-specific eieio() routines above... */
+# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
+#endif /* eieio */
 
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)