Merge git://oss.sgi.com:8090/xfs-2.6

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

diff --git a/fs/jffs2/acl.h b/fs/jffs2/acl.h
index 54761fa8f233571eeb0ab3dcbc8fb5a4d330a3ed..8893bd1a6ba7be45bdb17faeb65e7b0606575fb9 100644 (file)
--- a/fs/jffs2/acl.h
+++ b/fs/jffs2/acl.h
@@ -23,7 +23,6 @@ struct jffs2_acl_header {
        jint32_t        a_version;
 };
 
-#ifdef __KERNEL__
 #ifdef CONFIG_JFFS2_FS_POSIX_ACL
 
 #define JFFS2_ACL_NOT_CACHED ((void *)-1)
@@ -44,4 +43,3 @@ extern struct xattr_handler jffs2_acl_default_xattr_handler;
 #define jffs2_clear_acl(inode)
 
 #endif /* CONFIG_JFFS2_FS_POSIX_ACL */
-#endif /* __KERNEL__ */