vserver 1.9.5.x5

[linux-2.6.git] / include / linux / jffs2_fs_i.h

diff --git a/include/linux/jffs2_fs_i.h b/include/linux/jffs2_fs_i.h
index db91aa6..6dbb1cc 100644 (file)
--- a/include/linux/jffs2_fs_i.h
+++ b/include/linux/jffs2_fs_i.h
@@ -1,10 +1,11 @@
-/* $Id: jffs2_fs_i.h,v 1.15 2002/11/12 09:42:49 dwmw2 Exp $ */
+/* $Id: jffs2_fs_i.h,v 1.17 2004/11/11 23:51:27 dwmw2 Exp $ */
 
 #ifndef _JFFS2_FS_I
 #define _JFFS2_FS_I
 
 #include <linux/version.h>
 #include <linux/rbtree.h>
+#include <asm/semaphore.h>
 
 struct jffs2_inode_info {
        /* We need an internal semaphore similar to inode->i_sem.
@@ -36,9 +37,11 @@ struct jffs2_inode_info {
 
        uint16_t flags;
        uint8_t usercompr;
+#if !defined (__ECOS)
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,2)
        struct inode vfs_inode;
 #endif
+#endif
 };
 
 #endif /* _JFFS2_FS_I */