Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6] / fs / locks.c

diff --git a/fs/locks.c b/fs/locks.c
index 43c0af21a0c5fb563ceb12073d085e5ed45e2ddf..592faadbcec12f19b2f6ea158e956e2a3b01c838 100644 (file)
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -127,7 +127,6 @@
 #include <linux/rcupdate.h>
 #include <linux/pid_namespace.h>
 
-#include <asm/semaphore.h>
 #include <asm/uaccess.h>
 
 #define IS_POSIX(fl)   (fl->fl_flags & FL_POSIX)