Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / ipc / sem.c

diff --git a/ipc/sem.c b/ipc/sem.c
index d3e12efd55cb39e6cdce7cd48ac73833100f60cf..9964b2224c707d48c6aec6ef658bd3506e12467a 100644 (file)
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -75,7 +75,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/time.h>
-#include <linux/smp_lock.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/audit.h>