diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 11:31:34 +0400 |
commit | e152f18027552eb34006b35347e72bc805783027 (patch) | |
tree | ac9765e68597c08c24de447f46bb3e04d9881e1b /arch/arm64/include/asm/compat.h | |
parent | 49ba4f94bddb7f5272c4596d505f94355cc3fbd2 (diff) | |
parent | 42c364ace52ae6b4699105b39f2559c256b6cd4c (diff) | |
download | linux-e152f18027552eb34006b35347e72bc805783027.tar.xz |
Merge branch 'for-linus' into for-next
This is a preliminary merge before the upcoming merge of generic parser
branch.
Diffstat (limited to 'arch/arm64/include/asm/compat.h')
-rw-r--r-- | arch/arm64/include/asm/compat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h index d9ec40217a27..618b450e5a1d 100644 --- a/arch/arm64/include/asm/compat.h +++ b/arch/arm64/include/asm/compat.h @@ -23,6 +23,7 @@ */ #include <linux/types.h> #include <linux/sched.h> +#include <linux/ptrace.h> #define COMPAT_USER_HZ 100 #define COMPAT_UTS_MACHINE "armv8l\0\0" |