diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2017-04-13 00:48:47 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-04-13 00:48:47 +0200 |
| commit | e469b23cdec0fc8c49102882920e3951530e1740 (patch) | |
| tree | 7ef4e37f4c576c984157e897e7a461cea13f5983 /arch/mips/include/asm | |
| parent | 72f941af88a543e6a038c75b8467903b7812239c (diff) | |
| parent | 162b270c664dca2e0944308e92f9fcc887151a72 (diff) | |
Merge branch '4.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/asm-prototypes.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/asm-prototypes.h b/arch/mips/include/asm/asm-prototypes.h index a160cf69bb92..6e28971fe73a 100644 --- a/arch/mips/include/asm/asm-prototypes.h +++ b/arch/mips/include/asm/asm-prototypes.h @@ -3,3 +3,4 @@ #include <asm/fpu.h> #include <asm-generic/asm-prototypes.h> #include <asm/uaccess.h> +#include <asm/ftrace.h> |