Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...

[linux-2.6] / fs / binfmt_em86.c

diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c
index 1f2d1ad63319430ad4ea6ac4c2684df93829fc41..576dd7de22784e3007c5854d39ad867dc02d0bca 100644 (file)
--- a/fs/binfmt_em86.c
+++ b/fs/binfmt_em86.c
@@ -12,7 +12,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/binfmts.h>
 #include <linux/elf.h>
 #include <linux/init.h>