diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:24:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 20:24:02 -0700 |
| commit | 82b7ec75df5b52d6febffb02ce4080a67550ac56 (patch) | |
| tree | 20cb2f69de96583b2b3a390b7e1d345d52dfeec6 | |
| parent | [PATCH] m68knommu: extract common timer code for 68EZ328 processor (diff) | |
| parent | [XFS] Revert recent quota Makefile change, not in a fit state for merging. (diff) | |
| download | linux-dev-82b7ec75df5b52d6febffb02ce4080a67550ac56.tar.xz linux-dev-82b7ec75df5b52d6febffb02ce4080a67550ac56.zip | |
Merge git://oss.sgi.com:8090/oss/git/xfs-2.6
| -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 |