Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / s390 / kernel / process.c

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 11d9b0197626979a216e91f34182eaac7355e7d7..eb43c3b31269c64fe7da6f04f8a99bc53c82d2b2 100644 (file)
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>