From c8a9a6b1582c08ad852c5577d63b680954278813 Mon Sep 17 00:00:00 2001
From: KaiGai Kohei <kaigai@ak.jp.nec.com>
Date: Sat, 13 May 2006 15:19:36 +0900
Subject: [PATCH] --- yaml --- r: 27819 b: refs/heads/master c:
 5a14959c0700cd389d9e7ba312e15c8e85255e1f h: refs/heads/master i:   27817:
 9d616ad735d6200c81db99741a218cf859fd211e   27815:
 e17ec0a0aaac8e7fefe4ff73e94758f2a6e14057 v: v3

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

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__ */