[PATCH] powerpc: merge atomic.h, memory.h

[linux-2.6.git] / include / asm-ppc64 / futex.h

diff --git a/include/asm-ppc64/futex.h b/include/asm-ppc64/futex.h
index cb2640b3a408956c8e9c6a4d36a44e166381958a..266b460de44e1dcb6cbe69917ce64e49001a08f6 100644 (file)
--- a/include/asm-ppc64/futex.h
+++ b/include/asm-ppc64/futex.h
@@ -5,7 +5,7 @@
 
 #include <linux/futex.h>
 #include <asm/errno.h>
-#include <asm/memory.h>
+#include <asm/synch.h>
 #include <asm/uaccess.h>
 
 #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \