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 git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[pandora-kernel.git]
/
include
/
asm-parisc
/
futex.h
diff --git
a/include/asm-parisc/futex.h
b/include/asm-parisc/futex.h
index
fdc6d05
..
0c705c3
100644
(file)
--- a/
include/asm-parisc/futex.h
+++ b/
include/asm-parisc/futex.h
@@
-4,8
+4,8
@@
#ifdef __KERNEL__
#include <linux/futex.h>
+#include <linux/uaccess.h>
#include <asm/errno.h>
-#include <asm/uaccess.h>
static inline int
futex_atomic_op_inuser (int encoded_op, int __user *uaddr)