Return to xfs-modules CVS log

Up to [Development] / linux-2.4-xfs / split-patches

Fix up merge - an over-eager script seems to have patched some files twice..

Index: 2.4.x-xfs/fs/Makefile
===================================================================
--- 2.4.x-xfs.orig/fs/Makefile	2004-02-19 08:05:07.000000000 +1100
+++ 2.4.x-xfs/fs/Makefile	2004-04-19 19:58:57.000000000 +1000
@@ -8,7 +8,7 @@
 O_TARGET := fs.o
 
 export-objs :=	filesystems.o open.o dcache.o buffer.o dquot.o
-mod-subdirs :=	nls
+mod-subdirs :=	nls xfs
 
 obj-y :=	open.o read_write.o devices.o file_table.o buffer.o \
 		super.o block_dev.o char_dev.o stat.o exec.o pipe.o namei.o \
Index: 2.4.x-xfs/fs/Config.in
===================================================================
--- 2.4.x-xfs.orig/fs/Config.in	2004-04-19 19:58:40.000000000 +1000
+++ 2.4.x-xfs/fs/Config.in	2004-04-19 19:58:57.000000000 +1000
@@ -103,7 +103,7 @@
 
 tristate 'XFS filesystem support' CONFIG_XFS_FS
 dep_mbool    '  POSIX ACL support' CONFIG_XFS_POSIX_ACL $CONFIG_XFS_FS
-dep_mbool    '  Quota support' CONFIG_XFS_QUOTA $CONFIG_XFS_FS
+dep_tristate '  Quota support' CONFIG_XFS_QUOTA $CONFIG_XFS_FS
 dep_mbool    '  Realtime support (EXPERIMENTAL)' CONFIG_XFS_RT $CONFIG_XFS_FS $CONFIG_EXPERIMENTAL
 dep_mbool    '  Tracing support (EXPERIMENTAL)' CONFIG_XFS_TRACE $CONFIG_XFS_FS $CONFIG_EXPERIMENTAL
 dep_mbool    '  Debugging support (EXPERIMENTAL)' CONFIG_XFS_DEBUG $CONFIG_XFS_FS $CONFIG_EXPERIMENTAL