diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 19:55:32 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 19:55:32 +0200 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-sh/futex.h | |
| parent | [CIFS] fix typo (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.tar.xz linux-a815752ac0ffdb910e92958d41d28f4fb28e5296.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sh/futex.h')
| -rw-r--r-- | include/asm-sh/futex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/futex.h b/include/asm-sh/futex.h index 74ed3681d33c..68256ec5fa35 100644 --- a/include/asm-sh/futex.h +++ b/include/asm-sh/futex.h @@ -4,8 +4,8 @@ #ifdef __KERNEL__ #include <linux/futex.h> +#include <linux/uaccess.h> #include <asm/errno.h> -#include <asm/uaccess.h> /* XXX: UP variants, fix for SH-4A and SMP.. */ #include <asm/futex-irq.h> |