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 'jwb/next' into next
[pandora-kernel.git]
/
fs
/
jffs2
/
jffs2_fs_i.h
diff --git
a/fs/jffs2/jffs2_fs_i.h
b/fs/jffs2/jffs2_fs_i.h
index
4c41db9
..
c6923da
100644
(file)
--- a/
fs/jffs2/jffs2_fs_i.h
+++ b/
fs/jffs2/jffs2_fs_i.h
@@
-50,10
+50,6
@@
struct jffs2_inode_info {
uint16_t flags;
uint8_t usercompr;
struct inode vfs_inode;
-#ifdef CONFIG_JFFS2_FS_POSIX_ACL
- struct posix_acl *i_acl_access;
- struct posix_acl *i_acl_default;
-#endif
};
#endif /* _JFFS2_FS_I */