Commit be864971 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a53b75b3 cd065a01
......@@ -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>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment