summaryrefslogtreecommitdiff
path: root/arch/tile/kernel/sys.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-30 14:55:11 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-11-30 14:55:11 +0900
commit7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch)
treef23b591e8c6f921c91fce00a6453d4087ec3c071 /arch/tile/kernel/sys.c
parent5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff)
parent193006f7e3b1abd42d7a3677b54fa2996461a842 (diff)
downloadlinux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.tar.gz
linux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.tar.bz2
linux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.zip
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/tile/kernel/sys.c')
-rw-r--r--arch/tile/kernel/sys.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/tile/kernel/sys.c b/arch/tile/kernel/sys.c
index 7e764669a022..e2187d24a9b4 100644
--- a/arch/tile/kernel/sys.c
+++ b/arch/tile/kernel/sys.c
@@ -20,7 +20,6 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/mman.h>
#include <linux/file.h>