diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-07-06 18:51:29 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2006-07-06 18:52:04 -0400 |
| commit | 3af474609d45e8dc89deba54996de917c8e27af9 (patch) | |
| tree | 078717e3fc294bfd346b516d7fb31e9055e056ea | |
| parent | 702bf1757262f2895383c60b8a2237aade6fa1f7 (diff) | |
PPC64 build fix.
(cherry picked from b3e4d1d1f4bcf900146d7b8cd19e008209294663 commit)
| -rw-r--r-- | hw/xfree86/common/compiler.h | 5 |
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") |