diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-23 06:26:22 -0400 |
commit | 3357d4c75f1fb67e7304998c4ad4e9a9fed66fa4 (patch) | |
tree | ceba46966a5a1112a05d257d8ecb25ae5eee95e0 /fs/Makefile | |
parent | 364f6c717deef4a3ac4982e670fa9846b43cd060 (diff) | |
parent | ee98689be1b054897ff17655008c3048fe88be94 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'fs/Makefile')
-rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index 443f2bc56ccf..fc92e59e9faf 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
@@ -31,6 +31,7 @@ obj-$(CONFIG_BINFMT_FLAT) += binfmt_flat.o | |||
31 | 31 | ||
32 | obj-$(CONFIG_FS_MBCACHE) += mbcache.o | 32 | obj-$(CONFIG_FS_MBCACHE) += mbcache.o |
33 | obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o xattr_acl.o | 33 | obj-$(CONFIG_FS_POSIX_ACL) += posix_acl.o xattr_acl.o |
34 | obj-$(CONFIG_NFS_COMMON) += nfs_common/ | ||
34 | 35 | ||
35 | obj-$(CONFIG_QUOTA) += dquot.o | 36 | obj-$(CONFIG_QUOTA) += dquot.o |
36 | obj-$(CONFIG_QFMT_V1) += quota_v1.o | 37 | obj-$(CONFIG_QFMT_V1) += quota_v1.o |