xserver: Branch 'server-1_1-branch'
Adam Jackson
ajax at kemper.freedesktop.org
Fri Jul 7 01:52:10 EEST 2006
hw/xfree86/common/compiler.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
New commits:
diff-tree 3af474609d45e8dc89deba54996de917c8e27af9 (from 702bf1757262f2895383c60b8a2237aade6fa1f7)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date: Thu Jul 6 18:51:29 2006 -0400
PPC64 build fix.
(cherry picked from b3e4d1d1f4bcf900146d7b8cd19e008209294663 commit)
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 39c8b8c..001bbf2 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1079,7 +1079,10 @@ xf86WriteMmio32Be(__volatile__ void *bas
extern volatile unsigned char *ioBase;
#if defined(linux) && defined(__powerpc64__)
-# include <asm/memory.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+# include <asm/memory.h>
+# endif
#endif /* defined(linux) && defined(__powerpc64__) */
#ifndef eieio /* We deal with arch-specific eieio() routines above... */
# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
More information about the xorg-commit
mailing list