2 files changed, 5 insertions, 5 deletions

diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
index fbfcbe5a7cda..8e18ff157247 100644
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_XFS_TRACE),y)
 endif
 
 obj-$(CONFIG_XFS_FS)            += xfs.o
-obj-$(CONFIG_XFS_QUOTA)         += quota/
+xfs-$(CONFIG_XFS_QUOTA)         += quota/
 
 xfs-$(CONFIG_XFS_RT)            += xfs_rtalloc.o
 xfs-$(CONFIG_XFS_POSIX_ACL)     += xfs_acl.o
diff --git a/fs/xfs/quota/Makefile-linux-2.6 b/fs/xfs/quota/Makefile-linux-2.6
index 8b7b676718b9..93e60e839355 100644
--- a/fs/xfs/quota/Makefile-linux-2.6
+++ b/fs/xfs/quota/Makefile-linux-2.6
@@ -41,13 +41,13 @@ ifeq ($(CONFIG_XFS_TRACE),y)
         EXTRA_CFLAGS += -DXFS_VNODE_TRACE
 endif
 
-obj-$(CONFIG_XFS_QUOTA)         += xfs_quota.o
-
-xfs_quota-y                     += xfs_dquot.o \
+xfs-$(CONFIG_XFS_QUOTA)         += xfs_dquot.o \
                                    xfs_dquot_item.o \
                                    xfs_trans_dquot.o \
                                    xfs_qm_syscalls.o \
                                    xfs_qm_bhv.o \
                                    xfs_qm.o
 
-xfs_quota-$(CONFIG_PROC_FS)     += xfs_qm_stats.o
+ifeq ($(CONFIG_XFS_QUOTA),y)
+xfs-$(CONFIG_PROC_FS)           += xfs_qm_stats.o
+endif