git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.31-rc1' into dmaengine
[pandora-kernel.git]
/
fs
/
jffs2
/
os-linux.h
diff --git
a/fs/jffs2/os-linux.h
b/fs/jffs2/os-linux.h
index
2228380
..
a7f03b7
100644
(file)
--- a/
fs/jffs2/os-linux.h
+++ b/
fs/jffs2/os-linux.h
@@
-56,10
+56,6
@@
static inline void jffs2_init_inode_info(struct jffs2_inode_info *f)
f->target = NULL;
f->flags = 0;
f->usercompr = 0;
-#ifdef CONFIG_JFFS2_FS_POSIX_ACL
- f->i_acl_access = JFFS2_ACL_NOT_CACHED;
- f->i_acl_default = JFFS2_ACL_NOT_CACHED;
-#endif
}