[XFS] Fix modular XFS builds (Makefile botch).

Signed-off-by: Nathan Scott <nathans@sgi.com>

diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
index fbfcbe5a7cda30f2cb82f341b5d4c171ed7a3561..8e18ff1572474f397ece37bbb296253bc952592b 100644 (file)
--- 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 8b7b676718b9b25a568cb7be1be329ce063e0199..93e60e8393555bd93c4e93df787a3cab23dd5402 100644 (file)
--- 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