Merge tag 'cris-correction-for-3.14' of git://jni.nu/cris · be86497152 - Gogs: Go Git Service GfA electronic

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

Linus Torvalds 11 years ago

parent

a53b75b37a cd065a010a

commit

be86497152

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/cris/arch-v10/kernel/process.c
							 
								View File
							
				@@ -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>