i2c-omap: fix I2C timeouts due to recursive omap_i2c_{un,}idle()

[linux-2.6-omap-h63xx.git] / fs / jffs2 / jffs2_fs_i.h

diff --git a/fs/jffs2/jffs2_fs_i.h b/fs/jffs2/jffs2_fs_i.h
index 0b78fdc9773b3c7cea2056e1b9cc52f34abfce1d..4c41db91eaa45bffb0566d401d4a915abea4e32b 100644 (file)
--- a/fs/jffs2/jffs2_fs_i.h
+++ b/fs/jffs2/jffs2_fs_i.h
@@ -12,10 +12,9 @@
 #ifndef _JFFS2_FS_I
 #define _JFFS2_FS_I
 
-#include <linux/version.h>
 #include <linux/rbtree.h>
 #include <linux/posix_acl.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 struct jffs2_inode_info {
        /* We need an internal mutex similar to inode->i_mutex.
@@ -24,7 +23,7 @@ struct jffs2_inode_info {
           before letting GC proceed. Or we'd have to put ugliness
           into the GC code so it didn't attempt to obtain the i_mutex
           for the inode(s) which are already locked */
-       struct semaphore sem;
+       struct mutex sem;
 
        /* The highest (datanode) version number used for this ino */
        uint32_t highest_version;