git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.26-rc9' into sched/devel
[pandora-kernel.git]
/
include
/
asm-powerpc
/
futex.h
diff --git
a/include/asm-powerpc/futex.h
b/include/asm-powerpc/futex.h
index
3f3673f
..
6d406c5
100644
(file)
--- a/
include/asm-powerpc/futex.h
+++ b/
include/asm-powerpc/futex.h
@@
-4,9
+4,9
@@
#ifdef __KERNEL__
#include <linux/futex.h>
+#include <linux/uaccess.h>
#include <asm/errno.h>
#include <asm/synch.h>
-#include <asm/uaccess.h>
#include <asm/asm-compat.h>
#define __futex_atomic_op(insn, ret, oldval, uaddr, oparg) \