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 291948d5085a08ebac04c8f725c152d80a392805..d1491aa7a0e29da822b9924d45a626945c17fffe 100644 (file)
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@ -21,22 +21,7 @@ EXTRA_CFLAGS +=       -Ifs/xfs -Ifs/xfs/linux-2.6 -funsigned-char
 XFS_LINUX := linux-2.6
 
 ifeq ($(CONFIG_XFS_DEBUG),y)
-       EXTRA_CFLAGS += -g -DSTATIC="" -DDEBUG
-       EXTRA_CFLAGS += -DXFS_BUF_LOCK_TRACKING
-endif
-ifeq ($(CONFIG_XFS_TRACE),y)
-       EXTRA_CFLAGS += -DXFS_ALLOC_TRACE
-       EXTRA_CFLAGS += -DXFS_ATTR_TRACE
-       EXTRA_CFLAGS += -DXFS_BLI_TRACE
-       EXTRA_CFLAGS += -DXFS_BMAP_TRACE
-       EXTRA_CFLAGS += -DXFS_BMBT_TRACE
-       EXTRA_CFLAGS += -DXFS_DIR2_TRACE
-       EXTRA_CFLAGS += -DXFS_DQUOT_TRACE
-       EXTRA_CFLAGS += -DXFS_ILOCK_TRACE
-       EXTRA_CFLAGS += -DXFS_LOG_TRACE
-       EXTRA_CFLAGS += -DXFS_RW_TRACE
-       EXTRA_CFLAGS += -DXFS_BUF_TRACE
-       EXTRA_CFLAGS += -DXFS_VNODE_TRACE
+       EXTRA_CFLAGS += -g
 endif
 
 obj-$(CONFIG_XFS_FS)           += xfs.o
@@ -64,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 \
@@ -79,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 \
@@ -92,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 \
@@ -121,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