diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:07:10 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-11-06 03:07:10 -0500 |
| commit | 806468f8bf76a3cb2b626dd282946a6c9c0a50f0 (patch) | |
| tree | 2de54229a5623756417a9bad7f426a2e8b06cad7 /fs/btrfs/Makefile | |
| parent | 531f4b1ae5e0fc8c9b3f03838218e5ea178f80d3 (diff) | |
| parent | 5da6fcbc4eb50c0f55d520750332f5a6ab13508c (diff) | |
Merge git://git.jan-o-sch.net/btrfs-unstable into integration
Conflicts:
fs/btrfs/Makefile
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/scrub.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/Makefile')
| -rw-r--r-- | fs/btrfs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/Makefile b/fs/btrfs/Makefile index bdd6fb238ce..c0ddfd29c5e 100644 --- a/fs/btrfs/Makefile +++ b/fs/btrfs/Makefile @@ -8,6 +8,6 @@ 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 + reada.o backref.o btrfs-$(CONFIG_BTRFS_FS_POSIX_ACL) += acl.o |