diff --git a/[refs] b/[refs] index 4195ac731634..9a82d6b45da2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c975dd469d748ce619c510050d4fb407c2398591 +refs/heads/master: f11e4d7f533249ddfa110116200c5c3a509f9218 diff --git a/trunk/fs/btrfs/Makefile b/trunk/fs/btrfs/Makefile index c0ddfd29c5e5..bc5b3556cee6 100644 --- a/trunk/fs/btrfs/Makefile +++ b/trunk/fs/btrfs/Makefile @@ -11,3 +11,4 @@ btrfs-y += super.o ctree.o extent-tree.o print-tree.o root-tree.o dir-item.o \ reada.o backref.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o +btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o