summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/Makefile
diff options
context:
space:
mode:
authorChris Mason <chris.mason@fusionio.com>2012-07-25 19:17:39 -0400
committerChris Mason <chris.mason@fusionio.com>2012-07-25 19:19:10 -0400
commit113c1cb530e10bcada93d88ffaa6b521aae2d251 (patch)
treee41776281314eb8fdc6b07e1533491e5f9ec21af /fs/btrfs/Makefile
parentcd1cfc49153ba2bef247e500d8bd4d135193ece9 (diff)
parent31db9f7c23fbf7e95026143f79645de6507b583b (diff)
downloadop-kernel-dev-113c1cb530e10bcada93d88ffaa6b521aae2d251.zip
op-kernel-dev-113c1cb530e10bcada93d88ffaa6b521aae2d251.tar.gz
Merge branch 'send-v2' of git://github.com/ablock84/linux-btrfs into for-linus
This is the kernel portion of btrfs send/receive Conflicts: fs/btrfs/Makefile fs/btrfs/backref.h fs/btrfs/ctree.c fs/btrfs/ioctl.c fs/btrfs/ioctl.h Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/Makefile')
-rw-r--r--fs/btrfs/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile
index 0bc4d3a..d7fcdba 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -8,7 +8,7 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.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 \
- reada.o backref.o ulist.o qgroup.o
+ reada.o backref.o ulist.o qgroup.o send.o
btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o
btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o
OpenPOWER on IntegriCloud