aboutsummaryrefslogtreecommitdiff
path: root/fs/xfs/quota/Makefile-linux-2.6
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-09-08 23:03:30 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-09-08 23:03:30 +0100
commit223176bc722a7bf519904180e956292ae1d1e819 (patch)
tree75b84d09c4b6eed81e537a4e587236f05faa5b7d /fs/xfs/quota/Makefile-linux-2.6
parent7d333d6c739a5cd6d60102ea1a9940cbbb0546ec (diff)
parent1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff)
Merge branch 'master' of /usr/src/linux-2.6
Diffstat (limited to 'fs/xfs/quota/Makefile-linux-2.6')
-rw-r--r--fs/xfs/quota/Makefile-linux-2.68
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/quota/Makefile-linux-2.6 b/fs/xfs/quota/Makefile-linux-2.6
index 8b7b676718b..93e60e83935 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