Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6-omap-h63xx.git] / fs / jffs / jffs_fm.h

diff --git a/fs/jffs/jffs_fm.h b/fs/jffs/jffs_fm.h
index f64151e741225141f632400ddfded9788c6bb794..9ee6ad29eff5de856f5401464346a5b110324bc3 100644 (file)
--- a/fs/jffs/jffs_fm.h
+++ b/fs/jffs/jffs_fm.h
@@ -23,7 +23,7 @@
 #include <linux/types.h>
 #include <linux/jffs.h>
 #include <linux/mtd/mtd.h>
-#include <linux/config.h>
+#include <linux/mutex.h>
 
 /* The alignment between two nodes in the flash memory.  */
 #define JFFS_ALIGN_SIZE 4
@@ -97,7 +97,7 @@ struct jffs_fmcontrol
        struct jffs_fm *tail;
        struct jffs_fm *head_extra;
        struct jffs_fm *tail_extra;
-       struct semaphore biglock;
+       struct mutex biglock;
 };
 
 /* Notice the two members head_extra and tail_extra in the jffs_control