diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-11 16:56:49 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-11 16:56:49 -0500 |
| commit | 35fd035968de4f674b9d62ee7b1d80ab7a50c384 (patch) | |
| tree | 53a936ecdf8e9c59735fa4e7794ccb503b06d5d5 /fs/xfs/Makefile | |
| parent | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (diff) | |
| parent | ef14f0c1578dce4b688726eb2603e50b62d6665a (diff) | |
| download | op-kernel-dev-35fd035968de4f674b9d62ee7b1d80ab7a50c384.zip op-kernel-dev-35fd035968de4f674b9d62ee7b1d80ab7a50c384.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/fs/xfs/xfs
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 60f107e..7a59dae 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 |
