diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 09:01:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-28 09:01:14 -0800 |
| commit | be86497152220677e3e5cb326519e19d727f8674 (patch) | |
| tree | 5611a36a633c7d2e437b31d67b27776dab187818 | |
| parent | a53b75b37aacd85a2f005e80faf44a7c2e3aa0bc (diff) | |
| parent | cd065a010a97e3c330d1ded9af551664c9689b19 (diff) | |
Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris
Pull cris fix from Jesper Nilsson:
"One include too much was removed"
* tag 'cris-correction-for-3.14' of git://jni.nu/cris:
CRISv10: Readd missing header
| -rw-r--r-- | arch/cris/arch-v10/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c index c20e4e8c3663..02b783457be0 100644 --- a/arch/cris/arch-v10/kernel/process.c +++ b/arch/cris/arch-v10/kernel/process.c @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/err.h> #include <linux/fs.h> +#include <arch/svinto.h> #include <linux/init.h> #include <arch/system.h> #include <linux/ptrace.h> |