Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[GitHub/LineageOS/android_kernel_samsung_universal7580.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index dc20db348679d9f300f68af931b4e9b3a0019752..15f73014a208ce6f47dbc9c3ff3f2990cd2bcd5a 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -11,7 +11,7 @@ obj-y :=      open.o read_write.o file_table.o super.o \
                attr.o bad_inode.o file.o filesystems.o namespace.o \
                seq_file.o xattr.o libfs.o fs-writeback.o \
                pnode.o drop_caches.o splice.o sync.o utimes.o \
-               stack.o
+               stack.o fs_struct.o
 
 ifeq ($(CONFIG_BLOCK),y)
 obj-y +=       buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
@@ -51,11 +51,7 @@ obj-$(CONFIG_FS_POSIX_ACL)   += posix_acl.o xattr_acl.o
 obj-$(CONFIG_NFS_COMMON)       += nfs_common/
 obj-$(CONFIG_GENERIC_ACL)      += generic_acl.o
 
-obj-$(CONFIG_QUOTA)            += dquot.o
-obj-$(CONFIG_QFMT_V1)          += quota_v1.o
-obj-$(CONFIG_QFMT_V2)          += quota_v2.o
-obj-$(CONFIG_QUOTA_TREE)       += quota_tree.o
-obj-$(CONFIG_QUOTACTL)         += quota.o
+obj-y                          += quota/
 
 obj-$(CONFIG_PROC_FS)          += proc/
 obj-y                          += partitions/
@@ -124,3 +120,4 @@ obj-$(CONFIG_DEBUG_FS)              += debugfs/
 obj-$(CONFIG_OCFS2_FS)         += ocfs2/
 obj-$(CONFIG_BTRFS_FS)         += btrfs/
 obj-$(CONFIG_GFS2_FS)           += gfs2/
+obj-$(CONFIG_EXOFS_FS)          += exofs/