[XFS] Fix merge failures

[pandora-kernel.git] / fs / xfs / Makefile

diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile
index 737c9a4..c3dc491 100644 (file)
--- a/fs/xfs/Makefile
+++ b/fs/xfs/Makefile
@@ -85,13 +85,13 @@ xfs-y                               += xfs_alloc.o \
                                   xfs_trans_inode.o \
                                   xfs_trans_item.o \
                                   xfs_utils.o \
-                                  xfs_vfsops.o \
                                   xfs_vnodeops.o \
                                   xfs_rw.o \
                                   xfs_dmops.o \
                                   xfs_qmops.o
 
-xfs-$(CONFIG_XFS_TRACE)                += xfs_dir2_trace.o
+xfs-$(CONFIG_XFS_TRACE)                += xfs_btree_trace.o \
+                                  xfs_dir2_trace.o
 
 # Objects in linux/
 xfs-y                          += $(addprefix $(XFS_LINUX)/, \
@@ -106,7 +106,7 @@ xfs-y                               += $(addprefix $(XFS_LINUX)/, \
                                   xfs_iops.o \
                                   xfs_lrw.o \
                                   xfs_super.o \
-                                  xfs_vnode.o \
+                                  xfs_sync.o \
                                   xfs_xattr.o)
 
 # Objects in support/