diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-10 16:39:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-10 16:39:52 +0000 |
| commit | 9c1852b459f04f6309e40d1d167512b0a5598529 (patch) | |
| tree | a74526f1fe3f9826b81327f0b9ba9b98a543f87c /arch/mips/kernel/ptrace.c | |
| parent | 9b41da80e09128574f09bed8dc5a5fc6f72a8239 (diff) | |
| parent | 7ce7d89f48834cefece7804d38fc5d85382edf77 (diff) | |
| download | talos-op-linux-9c1852b459f04f6309e40d1d167512b0a5598529.tar.gz talos-op-linux-9c1852b459f04f6309e40d1d167512b0a5598529.zip | |
Merge tag 'v4.10-rc1' into asoc-samsung
Linux 4.10-rc1
Diffstat (limited to 'arch/mips/kernel/ptrace.c')
| -rw-r--r-- | arch/mips/kernel/ptrace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index a92994d60e91..c8ba26072132 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -41,7 +41,7 @@ #include <asm/pgtable.h> #include <asm/page.h> #include <asm/syscall.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/bootinfo.h> #include <asm/reg.h> |
