Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm

[linux-2.6-omap-h63xx.git] / fs / xfs / Makefile-linux-2.6

diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
index b49989bb89ad225dd2636f4d783cf3d57fdf5951..d1491aa7a0e29da822b9924d45a626945c17fffe 100644 (file)
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@ -49,7 +49,6 @@ xfs-y                         += xfs_alloc.o \
                                   xfs_alloc_btree.o \
                                   xfs_attr.o \
                                   xfs_attr_leaf.o \
-                                  xfs_behavior.o \
                                   xfs_bit.o \
                                   xfs_bmap.o \
                                   xfs_bmap_btree.o \
@@ -64,6 +63,7 @@ xfs-y                         += xfs_alloc.o \
                                   xfs_dir2_sf.o \
                                   xfs_error.o \
                                   xfs_extfree_item.o \
+                                  xfs_filestream.o \
                                   xfs_fsops.o \
                                   xfs_ialloc.o \
                                   xfs_ialloc_btree.o \
@@ -77,6 +77,7 @@ xfs-y                         += xfs_alloc.o \
                                   xfs_log.o \
                                   xfs_log_recover.o \
                                   xfs_mount.o \
+                                  xfs_mru_cache.o \
                                   xfs_rename.o \
                                   xfs_trans.o \
                                   xfs_trans_ail.o \
@@ -106,13 +107,11 @@ xfs-y                             += $(addprefix $(XFS_LINUX)/, \
                                   xfs_iops.o \
                                   xfs_lrw.o \
                                   xfs_super.o \
-                                  xfs_vfs.o \
                                   xfs_vnode.o)
 
 # Objects in support/
 xfs-y                          += $(addprefix support/, \
                                   debug.o \
-                                  move.o \
                                   uuid.o)
 
 xfs-$(CONFIG_XFS_TRACE)                += support/ktrace.o