From e63c17b19af0697dba5fd4acc34feda7f839507e Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 8 Sep 2005 15:38:52 +1000 Subject: [PATCH] --- yaml --- r: 7781 b: refs/heads/master c: eccdfcd6f8265300380fa14a83aeb14e69830323 h: refs/heads/master i: 7779: 1a9bf794f91df683d7b39aa44a1dca5cfd39b618 v: v3 --- [refs] | 2 +- trunk/fs/xfs/Makefile-linux-2.6 | 2 +- trunk/fs/xfs/quota/Makefile-linux-2.6 | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dc1830e40a66..11c81292b466 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20ba02879bc78cdf1ed89a1c6a92ee55d31ee103 +refs/heads/master: eccdfcd6f8265300380fa14a83aeb14e69830323 diff --git a/trunk/fs/xfs/Makefile-linux-2.6 b/trunk/fs/xfs/Makefile-linux-2.6 index fbfcbe5a7cda..8e18ff157247 100644 --- a/trunk/fs/xfs/Makefile-linux-2.6 +++ b/trunk/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/trunk/fs/xfs/quota/Makefile-linux-2.6 b/trunk/fs/xfs/quota/Makefile-linux-2.6 index 8b7b676718b9..93e60e839355 100644 --- a/trunk/fs/xfs/quota/Makefile-linux-2.6 +++ b/trunk/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