diff options
| author | Christoph Hellwig <hch@infradead.org> | 2013-12-20 05:16:37 -0800 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-01-25 23:58:16 -0500 |
| commit | 5c8ebd57b6a51daf53f75b7a16c45090a98a91a4 (patch) | |
| tree | 02e3d3b8f707f84effe15df3dfc0043481010390 /fs/Makefile | |
| parent | 9dad943ae7d4a01da6bb18e1a157ab1bfe6186cd (diff) | |
| download | op-kernel-dev-5c8ebd57b6a51daf53f75b7a16c45090a98a91a4.zip op-kernel-dev-5c8ebd57b6a51daf53f75b7a16c45090a98a91a4.tar.gz | |
fs: merge xattr_acl.c into posix_acl.c
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 4fe6df3..f2c1843 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_BINFMT_SOM) += binfmt_som.o obj-$(CONFIG_BINFMT_FLAT) += binfmt_flat.o obj-$(CONFIG_FS_MBCACHE) += mbcache.o -obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o xattr_acl.o +obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o obj-$(CONFIG_NFS_COMMON) += nfs_common/ obj-$(CONFIG_GENERIC_ACL) += generic_acl.o obj-$(CONFIG_COREDUMP) += coredump.o |
