diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:27:58 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-01-16 15:27:58 -0500 |
| commit | c126dea771be1b3c370c0ffc4a09e6a82d492a49 (patch) | |
| tree | 99fc723ba2e89d767e260244cf8d19467bc68c8b /fs/btrfs/Makefile | |
| parent | 9785dbdf265ddc47d5c88267d89a97648c0dc14b (diff) | |
| parent | 21adbd5cbb5344a3fca6bb7ddb2ab6cb03c44546 (diff) | |
Merge branch 'integrity-check-patch-v2' of git://btrfs.giantdisaster.de/git/btrfs into integration
Conflicts:
fs/btrfs/ctree.h
fs/btrfs/super.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/Makefile')
| -rw-r--r-- | fs/btrfs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index 70798407b9a..0c4fa2befae 100644 --- a/fs/btrfs/Makefile +++ b/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 ulist.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o +btrfs-$(CONFIG_BTRFS_FS_CHECK_INTEGRITY) += check-integrity.o |