Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index ea5b359476234452070e5ba64f44eb404c4f2107..d7312825592bd33e84cff35805a5430aebfb4220 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -463,40 +463,18 @@ config OCFS2_DEBUG_FS
          this option for debugging only as it is likely to decrease
          performance of the filesystem.
 
          this option for debugging only as it is likely to decrease
          performance of the filesystem.
 

-config MINIX_FS
-       tristate "Minix fs support"
-       help
-         Minix is a simple operating system used in many classes about OS's.
-         The minix file system (method to organize files on a hard disk
-         partition or a floppy disk) was the original file system for Linux,
-         but has been superseded by the second extended file system ext2fs.
-         You don't want to use the minix file system on your hard disk
-         because of certain built-in restrictions, but it is sometimes found
-         on older Linux floppy disks.  This option will enlarge your kernel
-         by about 28 KB. If unsure, say N.
-
-         To compile this file system support as a module, choose M here: the
-         module will be called minix.  Note that the file system of your root
-         partition (the one containing the directory /) cannot be compiled as
-         a module.
-
-config ROMFS_FS
-       tristate "ROM file system support"
-       ---help---
-         This is a very small read-only file system mainly intended for
-         initial ram disks of installation disks, but it could be used for
-         other read-only media as well.  Read
-         <file:Documentation/filesystems/romfs.txt> for details.
+endif # BLOCK

 
 

-         To compile this file system support as a module, choose M here: the
-         module will be called romfs.  Note that the file system of your
-         root partition (the one containing the directory /) cannot be a
-         module.
-
-         If you don't know whether you need it, then you don't need it:
-         answer N.
+config DNOTIFY
+       bool "Dnotify support"
+       default y
+       help
+         Dnotify is a directory-based per-fd file change notification system
+         that uses signals to communicate events to user-space.  There exist
+         superior alternatives, but some applications may still rely on
+         dnotify.

 
 

-endif
+         If unsure, say Y.

 
 config INOTIFY
        bool "Inotify file change notification support"
 
 config INOTIFY
        bool "Inotify file change notification support"


@@ -577,17 +555,6 @@ config QUOTACTL
        depends on XFS_QUOTA || QUOTA
        default y
 
        depends on XFS_QUOTA || QUOTA
        default y
 

-config DNOTIFY
-       bool "Dnotify support"
-       default y
-       help
-         Dnotify is a directory-based per-fd file change notification system
-         that uses signals to communicate events to user-space.  There exist
-         superior alternatives, but some applications may still rely on
-         dnotify.
-
-         If unsure, say Y.
-

 config AUTOFS_FS
        tristate "Kernel automounter support"
        help
 config AUTOFS_FS
        tristate "Kernel automounter support"
        help


@@ -713,7 +680,7 @@ config UDF_NLS
        depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
 
 endmenu
        depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
 
 endmenu

-endif
+endif # BLOCK

 
 if BLOCK
 menu "DOS/FAT/NT Filesystems"
 
 if BLOCK
 menu "DOS/FAT/NT Filesystems"


@@ -896,7 +863,7 @@ config NTFS_RW
          It is perfectly safe to say N here.
 
 endmenu
          It is perfectly safe to say N here.
 
 endmenu

-endif
+endif # BLOCK

 
 menu "Pseudo filesystems"
 
 
 menu "Pseudo filesystems"
 


@@ -1417,6 +1384,24 @@ config VXFS_FS
          To compile this as a module, choose M here: the module will be
          called freevxfs.  If unsure, say N.
 
          To compile this as a module, choose M here: the module will be
          called freevxfs.  If unsure, say N.
 

+config MINIX_FS
+       tristate "Minix file system support"
+       depends on BLOCK
+       help
+         Minix is a simple operating system used in many classes about OS's.
+         The minix file system (method to organize files on a hard disk
+         partition or a floppy disk) was the original file system for Linux,
+         but has been superseded by the second extended file system ext2fs.
+         You don't want to use the minix file system on your hard disk
+         because of certain built-in restrictions, but it is sometimes found
+         on older Linux floppy disks.  This option will enlarge your kernel
+         by about 28 KB. If unsure, say N.
+
+         To compile this file system support as a module, choose M here: the
+         module will be called minix.  Note that the file system of your root
+         partition (the one containing the directory /) cannot be compiled as
+         a module.
+

 
 config HPFS_FS
        tristate "OS/2 HPFS file system support"
 
 config HPFS_FS
        tristate "OS/2 HPFS file system support"


@@ -1434,7 +1419,6 @@ config HPFS_FS
          module will be called hpfs.  If unsure, say N.
 
 
          module will be called hpfs.  If unsure, say N.
 
 

-

 config QNX4FS_FS
        tristate "QNX4 file system support (read only)"
        depends on BLOCK
 config QNX4FS_FS
        tristate "QNX4 file system support (read only)"
        depends on BLOCK


@@ -1461,6 +1445,22 @@ config QNX4FS_RW
          It's currently broken, so for now:
          answer N.
 
          It's currently broken, so for now:
          answer N.
 

+config ROMFS_FS
+       tristate "ROM file system support"
+       depends on BLOCK
+       ---help---
+         This is a very small read-only file system mainly intended for
+         initial ram disks of installation disks, but it could be used for
+         other read-only media as well.  Read
+         <file:Documentation/filesystems/romfs.txt> for details.
+
+         To compile this file system support as a module, choose M here: the
+         module will be called romfs.  Note that the file system of your
+         root partition (the one containing the directory /) cannot be a
+         module.
+
+         If you don't know whether you need it, then you don't need it:
+         answer N.

 
 
 config SYSV_FS
 
 
 config SYSV_FS


@@ -1501,7 +1501,6 @@ config SYSV_FS
          If you haven't heard about all of this before, it's safe to say N.
 
 
          If you haven't heard about all of this before, it's safe to say N.
 
 

-

 config UFS_FS
        tristate "UFS file system support (read only)"
        depends on BLOCK
 config UFS_FS
        tristate "UFS file system support (read only)"
        depends on BLOCK


@@ -1779,12 +1778,9 @@ config SUNRPC_GSS
        tristate
 
 config SUNRPC_XPRT_RDMA
        tristate
 
 config SUNRPC_XPRT_RDMA

-       tristate "RDMA transport for sunrpc (EXPERIMENTAL)"
+       tristate

        depends on SUNRPC && INFINIBAND && EXPERIMENTAL
        depends on SUNRPC && INFINIBAND && EXPERIMENTAL

-       default m
-       help
-         Adds a client RPC transport for supporting kernel NFS over RDMA
-         mounts, including Infiniband and iWARP. Experimental.
+       default SUNRPC && INFINIBAND

 
 config SUNRPC_BIND34
        bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"
 
 config SUNRPC_BIND34
        bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"