Merge with /home/shaggy/git/linus-clean/

[linux-2.6] / fs / ext2 / acl.h

diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h
index fed96ae81a7d1c380a999a6c83e26ae44b621a6a..0bde85bafe386eb47187919a8409e0231b4f5298 100644 (file)
--- a/fs/ext2/acl.h
+++ b/fs/ext2/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 EXT2_ACL_VERSION       0x0001