[Linux-mips-commits]CVS: linux/fs Config.in,1.3,1.4 Makefile,1.4,1.5

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/fs
In directory usw-pr-cvs1:/tmp/cvs-serv23524/fs

Modified Files:
	Config.in Makefile 
Log Message:
Sync with OSS 2.4.14.



Index: Config.in
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Config.in	2001/11/06 00:30:47	1.3
+++ Config.in	2001/11/06 09:10:22	1.4
@@ -41,6 +41,7 @@
 
 tristate 'ISO 9660 CDROM file system support' CONFIG_ISO9660_FS
 dep_mbool '  Microsoft Joliet CDROM extensions' CONFIG_JOLIET $CONFIG_ISO9660_FS
+dep_mbool '  Transparent decompression extension' CONFIG_ZISOFS $CONFIG_ISO9660_FS
 
 tristate 'Minix fs support' CONFIG_MINIX_FS
 
@@ -126,6 +127,24 @@
    # for fs/nls/Config.in
    define_bool CONFIG_NCPFS_NLS n
    define_bool CONFIG_SMB_FS n
+fi
+
+#
+# Do we need the compression support?
+#
+if [ "$CONFIG_ZISOFS" = "y" ]; then
+   define_tristate CONFIG_ZISOFS_FS $CONFIG_ISO9660_FS
+else
+   define_tristate CONFIG_ZISOFS_FS n
+fi
+if [ "$CONFIG_CRAMFS" = "y" -o "$CONFIG_ZISOFS_FS" = "y" ]; then
+   define_tristate CONFIG_ZLIB_FS_INFLATE y
+else
+  if [ "$CONFIG_CRAMFS" = "m" -o "$CONFIG_ZISOFS_FS" = "m" ]; then
+     define_tristate CONFIG_ZLIB_FS_INFLATE m
+  else
+     define_tristate CONFIG_ZLIB_FS_INFLATE n
+  fi
 fi
 
 mainmenu_option next_comment

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	2001/11/06 00:30:47	1.4
+++ Makefile	2001/11/06 09:10:22	1.5
@@ -27,6 +27,7 @@
 
 # Do not add any filesystems before this line
 subdir-$(CONFIG_EXT2_FS)	+= ext2
+subdir-$(CONFIG_ZLIB_FS_INFLATE) += inflate_fs
 subdir-$(CONFIG_CRAMFS)		+= cramfs
 subdir-$(CONFIG_RAMFS)		+= ramfs
 subdir-$(CONFIG_CODA_FS)	+= coda