aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 11:19:10 -0400
committerAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 11:19:10 -0400
commitddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch)
treeaaf0392346a18b3e232ddeb5db3c4e917f7ca686 /fs
parent223176bc722a7bf519904180e956292ae1d1e819 (diff)
parent5f5024130287a9467a41b9f94ec170958ae45cbd (diff)
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/Makefile-linux-2.615
1 files changed, 13 insertions, 2 deletions
diff --git a/fs/xfs/Makefile-linux-2.6 b/fs/xfs/Makefile-linux-2.6
index 8e18ff157247..d8c87fa21ad1 100644
--- a/fs/xfs/Makefile-linux-2.6
+++ b/fs/xfs/Makefile-linux-2.6
@@ -1,5 +1,5 @@
1# 1#
2# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. 2# Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved.
3# 3#
4# This program is free software; you can redistribute it and/or modify it 4# This program is free software; you can redistribute it and/or modify it
5# under the terms of version 2 of the GNU General Public License as 5# under the terms of version 2 of the GNU General Public License as
@@ -55,7 +55,18 @@ ifeq ($(CONFIG_XFS_TRACE),y)
55endif 55endif
56 56
57obj-$(CONFIG_XFS_FS) += xfs.o 57obj-$(CONFIG_XFS_FS) += xfs.o
58xfs-$(CONFIG_XFS_QUOTA) += quota/ 58
59xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \
60 xfs_dquot.o \
61 xfs_dquot_item.o \
62 xfs_trans_dquot.o \
63 xfs_qm_syscalls.o \
64 xfs_qm_bhv.o \
65 xfs_qm.o)
66
67ifeq ($(CONFIG_XFS_QUOTA),y)
68xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o
69endif
59 70
60xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o 71xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o
61xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o 72xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o