diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-06-12 21:28:59 -0500 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-06-12 21:28:59 -0500 |
commit | fd40261354802b0f05f6f67121235aa002e87069 (patch) | |
tree | 935f23fa1528f6fe5a078383c9343907ea27fbb3 /fs/xfs/Makefile | |
parent | f3ad116588151b3371ae4e092290e4f48e62b8bb (diff) | |
parent | e83f1eb6bfc4004c19a99ee5f5aa65bd3fbecec3 (diff) |
Merge branch 'master' of git://oss.sgi.com/xfs/xfs into for-linus
Diffstat (limited to 'fs/xfs/Makefile')
-rw-r--r-- | fs/xfs/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/Makefile b/fs/xfs/Makefile index 60f107e47fe..7a59daed178 100644 --- a/fs/xfs/Makefile +++ b/fs/xfs/Makefile @@ -40,7 +40,7 @@ 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 +xfs-$(CONFIG_XFS_POSIX_ACL) += $(XFS_LINUX)/xfs_acl.o xfs-$(CONFIG_PROC_FS) += $(XFS_LINUX)/xfs_stats.o xfs-$(CONFIG_SYSCTL) += $(XFS_LINUX)/xfs_sysctl.o xfs-$(CONFIG_COMPAT) += $(XFS_LINUX)/xfs_ioctl32.o @@ -88,8 +88,7 @@ xfs-y += xfs_alloc.o \ xfs_utils.o \ xfs_vnodeops.o \ xfs_rw.o \ - xfs_dmops.o \ - xfs_qmops.o + xfs_dmops.o xfs-$(CONFIG_XFS_TRACE) += xfs_btree_trace.o \ xfs_dir2_trace.o |