diff --git a/[refs] b/[refs]
index e23db32b1d71..8badcbbefd4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee886b5df17f9791a72cf0afe7f6c0c079231ef8
+refs/heads/master: 5a14959c0700cd389d9e7ba312e15c8e85255e1f
diff --git a/trunk/fs/jffs2/acl.h b/trunk/fs/jffs2/acl.h
index 54761fa8f233..8893bd1a6ba7 100644
--- a/trunk/fs/jffs2/acl.h
+++ b/trunk/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__ */