diff options
| author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 17:19:10 +0200 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 17:19:10 +0200 |
| commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
| tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /fs | |
| parent | Merge branch 'master' of /usr/src/linux-2.6 (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.xz linux-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip | |
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.6 | 15 |
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 @@ # -# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. +# Copyright (c) 2000-2005 Silicon Graphics, Inc. All Rights Reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License as @@ -55,7 +55,18 @@ ifeq ($(CONFIG_XFS_TRACE),y) endif obj-$(CONFIG_XFS_FS) += xfs.o -xfs-$(CONFIG_XFS_QUOTA) += quota/ + +xfs-$(CONFIG_XFS_QUOTA) += $(addprefix quota/, \ + xfs_dquot.o \ + xfs_dquot_item.o \ + xfs_trans_dquot.o \ + xfs_qm_syscalls.o \ + xfs_qm_bhv.o \ + xfs_qm.o) + +ifeq ($(CONFIG_XFS_QUOTA),y) +xfs-$(CONFIG_PROC_FS) += quota/xfs_qm_stats.o +endif xfs-$(CONFIG_XFS_RT) += xfs_rtalloc.o xfs-$(CONFIG_XFS_POSIX_ACL) += xfs_acl.o |