diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-25 09:27:27 -0400 |
| commit | 38b22b6e9f46ab8f73ef5734f0e0a000766a9258 (patch) | |
| tree | 2ccc41ef55918d3af43e444bde7648562a031559 /fs/ext2/acl.h | |
| parent | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (diff) | |
| parent | b3e112bcc19abd8e9657dca34a87316786e096f3 (diff) | |
Automerge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/ext2/acl.h')
| -rw-r--r-- | fs/ext2/acl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/acl.h b/fs/ext2/acl.h index fed96ae81a7d..0bde85bafe38 100644 --- a/fs/ext2/acl.h +++ b/fs/ext2/acl.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> | 4 | (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org> |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/xattr_acl.h> | 7 | #include <linux/posix_acl_xattr.h> |
| 8 | 8 | ||
| 9 | #define EXT2_ACL_VERSION 0x0001 | 9 | #define EXT2_ACL_VERSION 0x0001 |
| 10 | 10 | ||