diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-mips/futex.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/futex.h')
| -rw-r--r-- | include/asm-mips/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/futex.h b/include/asm-mips/futex.h index 17f082cfea85..b9cce90346cf 100644 --- a/include/asm-mips/futex.h +++ b/include/asm-mips/futex.h | |||
| @@ -11,9 +11,9 @@ | |||
| 11 | #ifdef __KERNEL__ | 11 | #ifdef __KERNEL__ |
| 12 | 12 | ||
| 13 | #include <linux/futex.h> | 13 | #include <linux/futex.h> |
| 14 | #include <linux/uaccess.h> | ||
| 14 | #include <asm/barrier.h> | 15 | #include <asm/barrier.h> |
| 15 | #include <asm/errno.h> | 16 | #include <asm/errno.h> |
| 16 | #include <asm/uaccess.h> | ||
| 17 | #include <asm/war.h> | 17 | #include <asm/war.h> |
| 18 | 18 | ||
| 19 | #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \ | 19 | #define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \ |