summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAdam Jackson <ajax@benzedrine.nwnk.net>2006-07-06 18:51:29 -0400
committerAdam Jackson <ajax@benzedrine.nwnk.net>2006-07-06 18:51:29 -0400
commitb3e4d1d1f4bcf900146d7b8cd19e008209294663 (patch)
treeb5415c18e2cfe01de31ef488a4a8104bc351b548 /hw
parentf847f3c0a956c0aec8ade8e32f770daae147f40b (diff)
PPC64 build fix.
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/compiler.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index 39c8b8c59..001bbf2b3 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1079,7 +1079,10 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset,
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")