From: Paul M. <le...@us...> - 2001-11-06 00:31:16
|
Update of /cvsroot/linux-mips/linux/fs In directory usw-pr-cvs1:/tmp/cvs-serv388/fs Modified Files: Config.in Makefile Log Message: Sync with OSS 2.4.11. Index: Config.in =================================================================== RCS file: /cvsroot/linux-mips/linux/fs/Config.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Config.in 2001/08/10 18:51:06 1.2 +++ Config.in 2001/11/06 00:30:47 1.3 @@ -26,13 +26,14 @@ dep_tristate ' UMSDOS: Unix-like file system on top of standard MSDOS fs' CONFIG_UMSDOS_FS $CONFIG_MSDOS_FS dep_tristate ' VFAT (Windows-95) fs support' CONFIG_VFAT_FS $CONFIG_FAT_FS dep_tristate 'EFS file system support (read only) (EXPERIMENTAL)' CONFIG_EFS_FS $CONFIG_EXPERIMENTAL -dep_tristate 'Journalling Flash File System (JFFS) support (EXPERIMENTAL)' CONFIG_JFFS_FS $CONFIG_EXPERIMENTAL $CONFIG_MTD +dep_tristate 'Journalling Flash File System (JFFS) support' CONFIG_JFFS_FS $CONFIG_MTD if [ "$CONFIG_JFFS_FS" = "y" -o "$CONFIG_JFFS_FS" = "m" ] ; then int 'JFFS debugging verbosity (0 = quiet, 3 = noisy)' CONFIG_JFFS_FS_VERBOSE 0 + bool 'JFFS stats available in /proc filesystem' CONFIG_JFFS_PROC_FS fi -dep_tristate 'Journalling Flash Filesystem version 2 (EXPERIMENTAL)' CONFIG_JFFS2_FS $CONFIG_EXPERIMENTAL $CONFIG_MTD -if [ "$CONFIG_JFFS2_FS" != "n" ]; then - int 'JFFS2 debugging verbosity (0 = quiet)' CONFIG_JFFS2_FS_DEBUG 0 +dep_tristate 'Journalling Flash File System v2 (JFFS2) support (EXPERIMENTAL)' CONFIG_JFFS2_FS $CONFIG_EXPERIMENTAL $CONFIG_MTD +if [ "$CONFIG_JFFS2_FS" != "n" ] ; then + int 'JFFS2 debugging verbosity (0 = quiet, 3 = noisy)' CONFIG_JFFS2_FS_DEBUG 0 fi tristate 'Compressed ROM file system support' CONFIG_CRAMFS bool 'Virtual memory file system support (former shm fs)' CONFIG_TMPFS Index: Makefile =================================================================== RCS file: /cvsroot/linux-mips/linux/fs/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 2001/10/22 19:16:45 1.3 +++ Makefile 2001/11/06 00:30:47 1.4 @@ -14,7 +14,7 @@ super.o block_dev.o char_dev.o stat.o exec.o pipe.o namei.o \ fcntl.o ioctl.o readdir.o select.o fifo.o locks.o \ dcache.o inode.o attr.o bad_inode.o file.o iobuf.o dnotify.o \ - filesystems.o + filesystems.o namespace.o ifeq ($(CONFIG_QUOTA),y) obj-y += dquot.o |