Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82b7ec75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

parents 03981f24 c9fc0d6a

fs/xfs/Makefile-linux-2.6

+13 −2
Original line number Diff line number Diff line 
#

# 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