From c659ad30a1bc533e37f3a0e4415b9927fec76b75 Mon Sep 17 00:00:00 2001
From: Lachlan McIlroy <lachlan@redback.melbourne.sgi.com>
Date: Wed, 28 Nov 2007 18:28:09 +1100
Subject: [PATCH] --- yaml --- r: 85703 b: refs/heads/master c:
 269cdfaf769f5cd831284cc831790c7c5038040f h: refs/heads/master i:   85701:
 1cfd53a629ae7771c25b7ba2d4ca133254c0e163   85699:
 f7da5b7b5064e3b774e31256ee8cdb3407919917   85695:
 0929d7dbedba9e8533b57b3508214f1caa84263d v: v3

---
 [refs]                |  2 +-
 trunk/fs/xfs/Makefile | 31 +++++++++++++------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 54df8669842d..6f414c4d9bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 794f744b225aaf35742aac9e7b9dda96a9943413
+refs/heads/master: 269cdfaf769f5cd831284cc831790c7c5038040f
diff --git a/trunk/fs/xfs/Makefile b/trunk/fs/xfs/Makefile
index 57c923212d72..36ec614e699a 100644
--- a/trunk/fs/xfs/Makefile
+++ b/trunk/fs/xfs/Makefile
@@ -25,8 +25,18 @@ ifeq ($(CONFIG_XFS_DEBUG),y)
 endif
 
 obj-$(CONFIG_XFS_FS)		+= xfs.o
-obj-$(CONFIG_XFS_QUOTA)		+= quota/
-obj-$(CONFIG_XFS_DMAPI)		+= dmapi/
+
+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
@@ -96,8 +106,7 @@ xfs-y				+= $(addprefix $(XFS_LINUX)/, \
 				   xfs_iops.o \
 				   xfs_lrw.o \
 				   xfs_super.o \
-				   xfs_vnode.o \
-				   xfs_ksyms.o)
+				   xfs_vnode.o)
 
 # Objects in support/
 xfs-y				+= $(addprefix support/, \
@@ -106,17 +115,3 @@ xfs-y				+= $(addprefix support/, \
 
 xfs-$(CONFIG_XFS_TRACE)		+= support/ktrace.o
 
-# If both xfs and kdb modules are built in then xfsidbg is built in.  If xfs is
-# a module and kdb modules are being compiled then xfsidbg must be a module, to
-# follow xfs.  If xfs is built in then xfsidbg tracks the kdb module state.
-# This must come after the main xfs code so xfs initialises before xfsidbg.
-# KAO
-ifneq ($(CONFIG_KDB_MODULES),)
-  ifeq ($(CONFIG_XFS_FS),y)
-    obj-$(CONFIG_KDB_MODULES)	+= xfsidbg.o
-  else
-    obj-$(CONFIG_XFS_FS)	+= xfsidbg.o
-  endif
-endif
-
-CFLAGS_xfsidbg.o += -Iarch/$(ARCH)/kdb