diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2012-01-11 09:54:49 +0800 |
|---|---|---|
| committer | Li Zefan <lizf@cn.fujitsu.com> | 2012-01-11 09:54:49 +0800 |
| commit | d25223a0d22f7ec4203ec285dc6e51f696591ba3 (patch) | |
| tree | f54428e64f692edfa5bf75f8eb301329e32a895f /fs/btrfs/Makefile | |
| parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
| parent | 08c422c27f855d27b0b3d9fa30ebd938d4ae6f1f (diff) | |
| download | op-kernel-dev-d25223a0d22f7ec4203ec285dc6e51f696591ba3.zip op-kernel-dev-d25223a0d22f7ec4203ec285dc6e51f696591ba3.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs into for-linus
Diffstat (limited to 'fs/btrfs/Makefile')
| -rw-r--r-- | fs/btrfs/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 40e6ac0..c0ddfd2 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -7,6 +7,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ extent_map.o sysfs.o struct-funcs.o xattr.o ordered-data.o \ extent_io.o volumes.o async-thread.o ioctl.o locking.o orphan.o \ export.o tree-log.o free-space-cache.o zlib.o lzo.o \ - compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o + compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o \ + reada.o backref.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o |
