Merge remote branch 'origin' into secretlab/next-devicetree

[mv-sheeva.git] / arch / mn10300 / kernel / traps.c

diff --git a/arch/mn10300/kernel/traps.c b/arch/mn10300/kernel/traps.c
index 0dfdc500112411333ad61911ac49beb7b2aac31a..91365adba4f5568925d3398545d3b9bcc9ed9f96 100644 (file)
--- a/arch/mn10300/kernel/traps.c
+++ b/arch/mn10300/kernel/traps.c
@@ -17,7 +17,6 @@
 #include <linux/timer.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>