diff --git a/[refs] b/[refs]
index b448cfae411c..0977b1b0b0cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed8165c75e3dd0b2e51b92a858cabe29ba00c9cb
+refs/heads/master: cf9d1e428cc28ef5798aeda0822a6ce64849a439
diff --git a/trunk/fs/jffs2/jffs2_fs_i.h b/trunk/fs/jffs2/jffs2_fs_i.h
index b5427b5c9483..31559f45fdde 100644
--- a/trunk/fs/jffs2/jffs2_fs_i.h
+++ b/trunk/fs/jffs2/jffs2_fs_i.h
@@ -15,7 +15,7 @@
 #include <linux/version.h>
 #include <linux/rbtree.h>
 #include <linux/posix_acl.h>
-#include <linux/semaphore.h>
+#include <linux/mutex.h>
 
 struct jffs2_inode_info {
 	/* We need an internal mutex similar to inode->i_mutex.