From 7f49b1762992cff874be4877454661a66a831daf Mon Sep 17 00:00:00 2001
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Fri, 22 Sep 2006 10:13:46 +0100
Subject: [PATCH] --- yaml --- r: 34138 b: refs/heads/master c:
 f2dd117fa51dd8fc071b1352254c0d14d2399b0a h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/fs/jffs2/jffs2_fs_i.h | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f4d8f0ddcee6..a2b70b3a59d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbc88ba83ff772d8c47d95ba0fef38ad888d6fcf
+refs/heads/master: f2dd117fa51dd8fc071b1352254c0d14d2399b0a
diff --git a/trunk/fs/jffs2/jffs2_fs_i.h b/trunk/fs/jffs2/jffs2_fs_i.h
index 2e0cc8e00b85..3a566077ac95 100644
--- a/trunk/fs/jffs2/jffs2_fs_i.h
+++ b/trunk/fs/jffs2/jffs2_fs_i.h
@@ -41,11 +41,7 @@ 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
 #ifdef CONFIG_JFFS2_FS_POSIX_ACL
 	struct posix_acl *i_acl_access;
 	struct posix_acl *i_acl_default;