summaryrefslogtreecommitdiffstats
path: root/arch/m68knommu/kernel/process.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2010-11-26 15:04:42 +0100
committerIngo Molnar <mingo@elte.hu>2010-11-26 15:04:47 +0100
commite4e91ac410356da3a518188f371e9d3b52ee38ee (patch)
treee1b33743a08847030285d34bcb2eb8ba90f30a0c /arch/m68knommu/kernel/process.c
parentea7872b9d6a81101f6ba0ec141544a62fea35876 (diff)
parent3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff)
Merge commit 'v2.6.37-rc3' into perf/core
Merge reason: Pick up latest fixes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68knommu/kernel/process.c')
-rw-r--r--arch/m68knommu/kernel/process.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c
index 6d3390590e5..e2a63af5d51 100644
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
@@ -19,7 +19,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>