diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 02:07:33 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-06 02:07:33 -0400 |
commit | 054838bc019c90511d034fb796dc8c7715460fc2 (patch) | |
tree | a04b9fa86e3cfb8adb285fcd33bd47983f75d8fb /arch/h8300 | |
parent | d597580d373774b1bdab84b3d26ff0b55162b916 (diff) | |
parent | fc69910f329d61821897871e0e957eda39beb3d8 (diff) | |
download | op-kernel-dev-054838bc019c90511d034fb796dc8c7715460fc2.zip op-kernel-dev-054838bc019c90511d034fb796dc8c7715460fc2.tar.gz |
Merge commit 'fc69910f329d' into uaccess.mips
backmerge of a build fix from mainline
Diffstat (limited to 'arch/h8300')
-rw-r--r-- | arch/h8300/kernel/ptrace_h.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/kernel/ptrace_h.c b/arch/h8300/kernel/ptrace_h.c index fe3b567..f5ff3b7 100644 --- a/arch/h8300/kernel/ptrace_h.c +++ b/arch/h8300/kernel/ptrace_h.c @@ -9,7 +9,7 @@ */ #include <linux/linkage.h> -#include <linux/sched.h> +#include <linux/sched/signal.h> #include <asm/ptrace.h> #define BREAKINST 0x5730 /* trapa #3 */ |