Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / ext3 / acl.h

diff --git a/fs/ext3/acl.h b/fs/ext3/acl.h
index 98af0c0d0ba9570b23c4dc6602ee9eb5d922d011..0d1e6279cbfd5799a11f27f774fbcdaf8bd397fb 100644 (file)
--- a/fs/ext3/acl.h
+++ b/fs/ext3/acl.h
@@ -4,7 +4,7 @@
   (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
 */
 
-#include <linux/xattr_acl.h>
+#include <linux/posix_acl_xattr.h>
 
 #define EXT3_ACL_VERSION       0x0001
 
@@ -62,9 +62,6 @@ extern int ext3_permission (struct inode *, int, struct nameidata *);
 extern int ext3_acl_chmod (struct inode *);
 extern int ext3_init_acl (handle_t *, struct inode *, struct inode *);
 
-extern int init_ext3_acl(void);
-extern void exit_ext3_acl(void);
-
 #else  /* CONFIG_EXT3_FS_POSIX_ACL */
 #include <linux/sched.h>
 #define ext3_permission NULL