summaryrefslogtreecommitdiffstats
path: root/fs/jfs/jfs_acl.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@tglx.tec.linutronix.de>2005-06-26 23:20:36 +0200
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-06-26 23:20:36 +0200
commit7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch)
tree82d934ebf07f22a2c64c3b6d82ec24082878b43a /fs/jfs/jfs_acl.h
parent[MTD] NAND: Add Hynix to manufacturer list (diff)
parent[PATCH] ppc32: Fix MPC83xx IPIC external interrupt pending register offset (diff)
downloadlinux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.tar.xz
linux-7ca6448dbfb398bba36eda3c01bc14b86c3675be.zip
Merge with rsync://fileserver/linux
Update to Linus latest
Diffstat (limited to 'fs/jfs/jfs_acl.h')
-rw-r--r--fs/jfs/jfs_acl.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/jfs/jfs_acl.h b/fs/jfs/jfs_acl.h
index d2ae430adecf..a3acd3eec059 100644
--- a/fs/jfs/jfs_acl.h
+++ b/fs/jfs/jfs_acl.h
@@ -20,8 +20,6 @@
#ifdef CONFIG_JFS_POSIX_ACL
-#include <linux/xattr_acl.h>
-
int jfs_permission(struct inode *, int, struct nameidata *);
int jfs_init_acl(struct inode *, struct inode *);
int jfs_setattr(struct dentry *, struct iattr *);