--- xc/programs/Xserver/hw/xfree86/common/compiler.h.orig	2004-12-19 19:37:21.462967176 +0000
+++ xc/programs/Xserver/hw/xfree86/common/compiler.h	2004-12-19 19:38:37.399003264 +0000
@@ -1076,7 +1076,10 @@
 
 extern volatile unsigned char *ioBase;
 
+#include <asm/memory.h>
+#ifndef eieio /* We deal with arch-specific eieio() routines above... */
 #    define eieio()		__asm__ __volatile__ ("eieio" ::: "memory")
+#endif
 
 static __inline__ unsigned char
 xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)