summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/Makefile
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2011-05-23 06:30:52 -0400
committerChris Mason <chris.mason@oracle.com>2011-05-23 06:30:52 -0400
commit712673339a0d085358fd1cd3a6477cc7979bb69f (patch)
treeb2e268685e3cbba19a4adb2a47d853e4e461fcfc /fs/btrfs/Makefile
parentaa2dfb372a2a647beedac163ce6f8b0fcbefac29 (diff)
parent8628764e1a5e1998a42b9713e9edea7753653d01 (diff)
downloadlinux-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.bz2
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers
Conflicts: fs/btrfs/Makefile fs/btrfs/ctree.h fs/btrfs/volumes.h Signed-off-by: Chris Mason <chris.mason@oracle.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 a8411c22313d..9b72dcf1cd25 100644
--- a/fs/btrfs/Makefile
+++ b/fs/btrfs/Makefile
@@ -7,4 +7,4 @@ 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 acl.o free-space-cache.o zlib.o lzo.o \
- compression.o delayed-ref.o relocation.o delayed-inode.o
+ compression.o delayed-ref.o relocation.o delayed-inode.o scrub.o