Merge branch 'Kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/misc

* 'Kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/misc: (36 commits)
  fs/Kconfig: move 9p out
  fs/Kconfig: move afs out
  fs/Kconfig: move coda out
  fs/Kconfig: move the rest of ncpfs out
  fs/Kconfig: move smbfs out
  fs/Kconfig: move sunrpc out
  fs/Kconfig: move nfsd out
  fs/Kconfig: move nfs out
  fs/Kconfig: move ufs out
  fs/Kconfig: move sysv out
  fs/Kconfig: move romfs out
  fs/Kconfig: move qnx4 out
  fs/Kconfig: move hpfs out
  fs/Kconfig: move omfs out
  fs/Kconfig: move minix out
  fs/Kconfig: move vxfs out
  fs/Kconfig: move squashfs out
  fs/Kconfig: move cramfs out
  fs/Kconfig: move efs out
  fs/Kconfig: move bfs out
  ...

40 files changed, 1363 insertions, 1363 deletions

diff --git a/fs/9p/Kconfig b/fs/9p/Kconfig
new file mode 100644
index 000000000000..74e0723e90bc
--- /dev/null
+++ b/fs/9p/Kconfig
@@ -0,0 +1,10 @@
+config 9P_FS
+        tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
+        depends on INET && NET_9P && EXPERIMENTAL
+        help
+          If you say Y here, you will get experimental support for
+          Plan 9 resource sharing via the 9P2000 protocol.
+
+          See <http://v9fs.sf.net> for more information.
+
+          If unsure, say N.
diff --git a/fs/Kconfig b/fs/Kconfig
index 51307b0fdf0f..93945dd0b1ae 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -27,141 +27,8 @@ config FS_MBCACHE
         default y if EXT4_FS=y && EXT4_FS_XATTR
         default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
 
-config REISERFS_FS
-        tristate "Reiserfs support"
-        help
-          Stores not just filenames but the files themselves in a balanced
-          tree.  Uses journalling.
-
-          Balanced trees are more efficient than traditional file system
-          architectural foundations.
-
-          In general, ReiserFS is as fast as ext2, but is very efficient with
-          large directories and small files.  Additional patches are needed
-          for NFS and quotas, please see <http://www.namesys.com/> for links.
-
-          It is more easily extended to have features currently found in
-          database and keyword search systems than block allocation based file
-          systems are.  The next version will be so extended, and will support
-          plugins consistent with our motto ``It takes more than a license to
-          make source code open.''
-
-          Read <http://www.namesys.com/> to learn more about reiserfs.
-
-          Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.
-
-          If you like it, you can pay us to add new features to it that you
-          need, buy a support contract, or pay us to port it to another OS.
-
-config REISERFS_CHECK
-        bool "Enable reiserfs debug mode"
-        depends on REISERFS_FS
-        help
-          If you set this to Y, then ReiserFS will perform every check it can
-          possibly imagine of its internal consistency throughout its
-          operation.  It will also go substantially slower.  More than once we
-          have forgotten that this was on, and then gone despondent over the
-          latest benchmarks.:-) Use of this option allows our team to go all
-          out in checking for consistency when debugging without fear of its
-          effect on end users.  If you are on the verge of sending in a bug
-          report, say Y and you might get a useful error message.  Almost
-          everyone should say N.
-
-config REISERFS_PROC_INFO
-        bool "Stats in /proc/fs/reiserfs"
-        depends on REISERFS_FS && PROC_FS
-        help
-          Create under /proc/fs/reiserfs a hierarchy of files, displaying
-          various ReiserFS statistics and internal data at the expense of
-          making your kernel or module slightly larger (+8 KB). This also
-          increases the amount of kernel memory required for each mount.
-          Almost everyone but ReiserFS developers and people fine-tuning
-          reiserfs or tracing problems should say N.
-
-config REISERFS_FS_XATTR
-        bool "ReiserFS extended attributes"
-        depends on REISERFS_FS
-        help
-          Extended attributes are name:value pairs associated with inodes by
-          the kernel or by users (see the attr(5) manual page, or visit
-          <http://acl.bestbits.at/> for details).
-
-          If unsure, say N.
-
-config REISERFS_FS_POSIX_ACL
-        bool "ReiserFS POSIX Access Control Lists"
-        depends on REISERFS_FS_XATTR
-        select FS_POSIX_ACL
-        help
-          Posix Access Control Lists (ACLs) support permissions for users and
-          groups beyond the owner/group/world scheme.
-
-          To learn more about Access Control Lists, visit the Posix ACLs for
-          Linux website <http://acl.bestbits.at/>.
-
-          If you don't know what Access Control Lists are, say N
-
-config REISERFS_FS_SECURITY
-        bool "ReiserFS Security Labels"
-        depends on REISERFS_FS_XATTR
-        help
-          Security labels support alternative access control models
-          implemented by security modules like SELinux.  This option
-          enables an extended attribute handler for file security
-          labels in the ReiserFS filesystem.
-
-          If you are not using a security module that requires using
-          extended attributes for file security labels, say N.
-
-config JFS_FS
-        tristate "JFS filesystem support"
-        select NLS
-        help
-          This is a port of IBM's Journaled Filesystem .  More information is
-          available in the file <file:Documentation/filesystems/jfs.txt>.
-
-          If you do not intend to use the JFS filesystem, say N.
-
-config JFS_POSIX_ACL
-        bool "JFS POSIX Access Control Lists"
-        depends on JFS_FS
-        select FS_POSIX_ACL
-        help
-          Posix Access Control Lists (ACLs) support permissions for users and
-          groups beyond the owner/group/world scheme.
-
-          To learn more about Access Control Lists, visit the Posix ACLs for
-          Linux website <http://acl.bestbits.at/>.
-
-          If you don't know what Access Control Lists are, say N
-
-config JFS_SECURITY
-        bool "JFS Security Labels"
-        depends on JFS_FS
-        help
-          Security labels support alternative access control models
-          implemented by security modules like SELinux.  This option
-          enables an extended attribute handler for file security
-          labels in the jfs filesystem.
-
-          If you are not using a security module that requires using
-          extended attributes for file security labels, say N.
-
-config JFS_DEBUG
-        bool "JFS debugging"
-        depends on JFS_FS
-        help
-          If you are experiencing any problems with the JFS filesystem, say
-          Y here.  This will result in additional debugging messages to be
-          written to the system log.  Under normal circumstances, this
-          results in very little overhead.
-
-config JFS_STATISTICS
-        bool "JFS statistics"
-        depends on JFS_FS
-        help
-          Enabling this option will cause statistics from the JFS file system
-          to be made available to the user in the /proc/fs/jfs/ directory.
+source "fs/reiserfs/Kconfig"
+source "fs/jfs/Kconfig"
 
 config FS_POSIX_ACL
 # Posix ACL utility routines (for now, only ext2/ext3/jfs/reiserfs/nfs4)
@@ -182,111 +49,8 @@ config FILE_LOCKING
 
 source "fs/xfs/Kconfig"
 source "fs/gfs2/Kconfig"
-
-config OCFS2_FS
-        tristate "OCFS2 file system support"
-        depends on NET && SYSFS
-        select CONFIGFS_FS
-        select JBD2
-        select CRC32
-        select QUOTA
-        select QUOTA_TREE
-        help
-          OCFS2 is a general purpose extent based shared disk cluster file
-          system with many similarities to ext3. It supports 64 bit inode
-          numbers, and has automatically extending metadata groups which may
-          also make it attractive for non-clustered use.
-
-          You'll want to install the ocfs2-tools package in order to at least
-          get "mount.ocfs2".
-
-          Project web page:    http://oss.oracle.com/projects/ocfs2
-          Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
-          OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
-
-          For more information on OCFS2, see the file
-          <file:Documentation/filesystems/ocfs2.txt>.
-
-config OCFS2_FS_O2CB
-        tristate "O2CB Kernelspace Clustering"
-        depends on OCFS2_FS
-        default y
-        help
-          OCFS2 includes a simple kernelspace clustering package, the OCFS2
-          Cluster Base.  It only requires a very small userspace component
-          to configure it. This comes with the standard ocfs2-tools package.
-          O2CB is limited to maintaining a cluster for OCFS2 file systems.
-          It cannot manage any other cluster applications.
-
-          It is always safe to say Y here, as the clustering method is
-          run-time selectable.
-
-config OCFS2_FS_USERSPACE_CLUSTER
-        tristate "OCFS2 Userspace Clustering"
-        depends on OCFS2_FS && DLM
-        default y
-        help
-          This option will allow OCFS2 to use userspace clustering services
-          in conjunction with the DLM in fs/dlm.  If you are using a
-          userspace cluster manager, say Y here.
-
-          It is safe to say Y, as the clustering method is run-time
-          selectable.
-
-config OCFS2_FS_STATS
-        bool "OCFS2 statistics"
-        depends on OCFS2_FS
-        default y
-        help
-          This option allows some fs statistics to be captured. Enabling
-          this option may increase the memory consumption.
-
-config OCFS2_DEBUG_MASKLOG
-        bool "OCFS2 logging support"
-        depends on OCFS2_FS
-        default y
-        help
-          The ocfs2 filesystem has an extensive logging system.  The system
-          allows selection of events to log via files in /sys/o2cb/logmask/.
-          This option will enlarge your kernel, but it allows debugging of
-          ocfs2 filesystem issues.
-
-config OCFS2_DEBUG_FS
-        bool "OCFS2 expensive checks"
-        depends on OCFS2_FS
-        default n
-        help
-          This option will enable expensive consistency checks. Enable
-          this option for debugging only as it is likely to decrease
-          performance of the filesystem.
-
-config OCFS2_FS_POSIX_ACL
-        bool "OCFS2 POSIX Access Control Lists"
-        depends on OCFS2_FS
-        select FS_POSIX_ACL
-        default n
-        help
-          Posix Access Control Lists (ACLs) support permissions for users and
-          groups beyond the owner/group/world scheme.
-
-config BTRFS_FS
-        tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
-        depends on EXPERIMENTAL
-        select LIBCRC32C
-        select ZLIB_INFLATE
-        select ZLIB_DEFLATE
-        help
-          Btrfs is a new filesystem with extents, writable snapshotting,
-          support for multiple devices and many more features.
-
-          Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET
-          FINALIZED.  You should say N here unless you are interested in
-          testing Btrfs with non-critical data.
-
-          To compile this file system support as a module, choose M here. The
-          module will be called btrfs.
-
-          If unsure, say N.
+source "fs/ocfs2/Kconfig"
+source "fs/btrfs/Kconfig"
 
 endif # BLOCK
 
@@ -348,64 +112,9 @@ config QUOTACTL
         depends on XFS_QUOTA || QUOTA
         default y
 
-config AUTOFS_FS
-        tristate "Kernel automounter support"
-        help
-          The automounter is a tool to automatically mount remote file systems
-          on demand. This implementation is partially kernel-based to reduce
-          overhead in the already-mounted case; this is unlike the BSD
-          automounter (amd), which is a pure user space daemon.
-
-          To use the automounter you need the user-space tools from the autofs
-          package; you can find the location in <file:Documentation/Changes>.
-          You also want to answer Y to "NFS file system support", below.
-
-          If you want to use the newer version of the automounter with more
-          features, say N here and say Y to "Kernel automounter v4 support",
-          below.
-
-          To compile this support as a module, choose M here: the module will be
-          called autofs.
-
-          If you are not a part of a fairly large, distributed network, you
-          probably do not need an automounter, and can say N here.
-
-config AUTOFS4_FS
-        tristate "Kernel automounter version 4 support (also supports v3)"
-        help
-          The automounter is a tool to automatically mount remote file systems
-          on demand. This implementation is partially kernel-based to reduce
-          overhead in the already-mounted case; this is unlike the BSD
-          automounter (amd), which is a pure user space daemon.
-
-          To use the automounter you need the user-space tools from
-          <ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/>; you also
-          want to answer Y to "NFS file system support", below.
-
-          To compile this support as a module, choose M here: the module will be
-          called autofs4.  You will need to add "alias autofs autofs4" to your
-          modules configuration file.
-
-          If you are not a part of a fairly large, distributed network or
-          don't have a laptop which needs to dynamically reconfigure to the
-          local network, you probably do not need an automounter, and can say
-          N here.
-
-config FUSE_FS
-        tristate "FUSE (Filesystem in Userspace) support"
-        help
-          With FUSE it is possible to implement a fully functional filesystem
-          in a userspace program.
-
-          There's also companion library: libfuse.  This library along with
-          utilities is available from the FUSE homepage:
-          <http://fuse.sourceforge.net/>
-
-          See <file:Documentation/filesystems/fuse.txt> for more information.
-          See <file:Documentation/Changes> for needed library/utility version.
-
-          If you want to develop a userspace FS, or if you want to use
-          a filesystem based on FUSE, answer Y or M.
+source "fs/autofs/Kconfig"
+source "fs/autofs4/Kconfig"
+source "fs/fuse/Kconfig"
 
 config GENERIC_ACL
         bool
@@ -414,64 +123,8 @@ config GENERIC_ACL
 if BLOCK
 menu "CD-ROM/DVD Filesystems"
 
-config ISO9660_FS
-        tristate "ISO 9660 CDROM file system support"
-        help
-          This is the standard file system used on CD-ROMs.  It was previously
-          known as "High Sierra File System" and is called "hsfs" on other
-          Unix systems.  The so-called Rock-Ridge extensions which allow for
-          long Unix filenames and symbolic links are also supported by this
-          driver.  If you have a CD-ROM drive and want to do more with it than
-          just listen to audio CDs and watch its LEDs, say Y (and read
-          <file:Documentation/filesystems/isofs.txt> and the CD-ROM-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>), thereby
-          enlarging your kernel by about 27 KB; otherwise say N.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called isofs.
-
-config JOLIET
-        bool "Microsoft Joliet CDROM extensions"
-        depends on ISO9660_FS
-        select NLS
-        help
-          Joliet is a Microsoft extension for the ISO 9660 CD-ROM file system
-          which allows for long filenames in unicode format (unicode is the
-          new 16 bit character code, successor to ASCII, which encodes the
-          characters of almost all languages of the world; see
-          <http://www.unicode.org/> for more information).  Say Y here if you
-          want to be able to read Joliet CD-ROMs under Linux.
-
-config ZISOFS
-        bool "Transparent decompression extension"
-        depends on ISO9660_FS
-        select ZLIB_INFLATE
-        help
-          This is a Linux-specific extension to RockRidge which lets you store
-          data in compressed form on a CD-ROM and have it transparently
-          decompressed when the CD-ROM is accessed.  See
-          <http://www.kernel.org/pub/linux/utils/fs/zisofs/> for the tools
-          necessary to create such a filesystem.  Say Y here if you want to be
-          able to read such compressed CD-ROMs.
-
-config UDF_FS
-        tristate "UDF file system support"
-        select CRC_ITU_T
-        help
-          This is the new file system used on some CD-ROMs and DVDs. Say Y if
-          you intend to mount DVD discs or CDRW's written in packet mode, or
-          if written to by other UDF utilities, such as DirectCD.
-          Please read <file:Documentation/filesystems/udf.txt>.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called udf.
-
-          If unsure, say N.
-
-config UDF_NLS
-        bool
-        default y
-        depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
+source "fs/isofs/Kconfig"
+source "fs/udf/Kconfig"
 
 endmenu
 endif # BLOCK
@@ -479,182 +132,8 @@ endif # BLOCK
 if BLOCK
 menu "DOS/FAT/NT Filesystems"
 
-config FAT_FS
-        tristate
-        select NLS
-        help
-          If you want to use one of the FAT-based file systems (the MS-DOS and
-          VFAT (Windows 95) file systems), then you must say Y or M here
-          to include FAT support. You will then be able to mount partitions or
-          diskettes with FAT-based file systems and transparently access the
-          files on them, i.e. MSDOS files will look and behave just like all
-          other Unix files.
-
-          This FAT support is not a file system in itself, it only provides
-          the foundation for the other file systems. You will have to say Y or
-          M to at least one of "MSDOS fs support" or "VFAT fs support" in
-          order to make use of it.
-
-          Another way to read and write MSDOS floppies and hard drive
-          partitions from within Linux (but not transparently) is with the
-          mtools ("man mtools") program suite. You don't need to say Y here in
-          order to do that.
-
-          If you need to move large files on floppies between a DOS and a
-          Linux box, say Y here, mount the floppy under Linux with an MSDOS
-          file system and use GNU tar's M option. GNU tar is a program
-          available for Unix and DOS ("man tar" or "info tar").
-
-          The FAT support will enlarge your kernel by about 37 KB. If unsure,
-          say Y.
-
-          To compile this as a module, choose M here: the module will be called
-          fat.  Note that if you compile the FAT support as a module, you
-          cannot compile any of the FAT-based file systems into the kernel
-          -- they will have to be modules as well.
-
-config MSDOS_FS
-        tristate "MSDOS fs support"
-        select FAT_FS
-        help
-          This allows you to mount MSDOS partitions of your hard drive (unless
-          they are compressed; to access compressed MSDOS partitions under
-          Linux, you can either use the DOS emulator DOSEMU, described in the
-          DOSEMU-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>, or try dmsdosfs in
-          <ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/>. If you
-          intend to use dosemu with a non-compressed MSDOS partition, say Y
-          here) and MSDOS floppies. This means that file access becomes
-          transparent, i.e. the MSDOS files look and behave just like all
-          other Unix files.
-
-          If you have Windows 95 or Windows NT installed on your MSDOS
-          partitions, you should use the VFAT file system (say Y to "VFAT fs
-          support" below), or you will not be able to see the long filenames
-          generated by Windows 95 / Windows NT.
-
-          This option will enlarge your kernel by about 7 KB. If unsure,
-          answer Y. This will only work if you said Y to "DOS FAT fs support"
-          as well. To compile this as a module, choose M here: the module will
-          be called msdos.
-
-config VFAT_FS
-        tristate "VFAT (Windows-95) fs support"
-        select FAT_FS
-        help
-          This option provides support for normal Windows file systems with
-          long filenames.  That includes non-compressed FAT-based file systems
-          used by Windows 95, Windows 98, Windows NT 4.0, and the Unix
-          programs from the mtools package.
-
-          The VFAT support enlarges your kernel by about 10 KB and it only
-          works if you said Y to the "DOS FAT fs support" above.  Please read
-          the file <file:Documentation/filesystems/vfat.txt> for details.  If
-          unsure, say Y.
-
-          To compile this as a module, choose M here: the module will be called
-          vfat.
-
-config FAT_DEFAULT_CODEPAGE
-        int "Default codepage for FAT"
-        depends on MSDOS_FS || VFAT_FS
-        default 437
-        help
-          This option should be set to the codepage of your FAT filesystems.
-          It can be overridden with the "codepage" mount option.
-          See <file:Documentation/filesystems/vfat.txt> for more information.
-
-config FAT_DEFAULT_IOCHARSET
-        string "Default iocharset for FAT"
-        depends on VFAT_FS
-        default "iso8859-1"
-        help
-          Set this to the default input/output character set you'd
-          like FAT to use. It should probably match the character set
-          that most of your FAT filesystems use, and can be overridden
-          with the "iocharset" mount option for FAT filesystems.
-          Note that "utf8" is not recommended for FAT filesystems.
-          If unsure, you shouldn't set "utf8" here.
-          See <file:Documentation/filesystems/vfat.txt> for more information.
-
-config NTFS_FS
-        tristate "NTFS file system support"
-        select NLS
-        help
-          NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
-
-          Saying Y or M here enables read support.  There is partial, but
-          safe, write support available.  For write support you must also
-          say Y to "NTFS write support" below.
-
-          There are also a number of user-space tools available, called
-          ntfsprogs.  These include ntfsundelete and ntfsresize, that work
-          without NTFS support enabled in the kernel.
-
-          This is a rewrite from scratch of Linux NTFS support and replaced
-          the old NTFS code starting with Linux 2.5.11.  A backport to
-          the Linux 2.4 kernel series is separately available as a patch
-          from the project web site.
-
-          For more information see <file:Documentation/filesystems/ntfs.txt>
-          and <http://www.linux-ntfs.org/>.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called ntfs.
-
-          If you are not using Windows NT, 2000, XP or 2003 in addition to
-          Linux on your computer it is safe to say N.
-
-config NTFS_DEBUG
-        bool "NTFS debugging support"
-        depends on NTFS_FS
-        help
-          If you are experiencing any problems with the NTFS file system, say
-          Y here.  This will result in additional consistency checks to be
-          performed by the driver as well as additional debugging messages to
-          be written to the system log.  Note that debugging messages are
-          disabled by default.  To enable them, supply the option debug_msgs=1
-          at the kernel command line when booting the kernel or as an option
-          to insmod when loading the ntfs module.  Once the driver is active,
-          you can enable debugging messages by doing (as root):
-          echo 1 > /proc/sys/fs/ntfs-debug
-          Replacing the "1" with "0" would disable debug messages.
-
-          If you leave debugging messages disabled, this results in little
-          overhead, but enabling debug messages results in very significant
-          slowdown of the system.
-
-          When reporting bugs, please try to have available a full dump of
-          debugging messages while the misbehaviour was occurring.
-
-config NTFS_RW
-        bool "NTFS write support"
-        depends on NTFS_FS
-        help
-          This enables the partial, but safe, write support in the NTFS driver.
-
-          The only supported operation is overwriting existing files, without
-          changing the file length.  No file or directory creation, deletion or
-          renaming is possible.  Note only non-resident files can be written to
-          so you may find that some very small files (<500 bytes or so) cannot
-          be written to.
-
-          While we cannot guarantee that it will not damage any data, we have
-          so far not received a single report where the driver would have
-          damaged someones data so we assume it is perfectly safe to use.
-
-          Note:  While write support is safe in this version (a rewrite from
-          scratch of the NTFS support), it should be noted that the old NTFS
-          write support, included in Linux 2.5.10 and before (since 1997),
-          is not safe.
-
-          This is currently useful with TopologiLinux.  TopologiLinux is run
-          on top of any DOS/Microsoft Windows system without partitioning your
-          hard disk.  Unlike other Linux distributions TopologiLinux does not
-          need its own partition.  For more information see
-          <http://topologi-linux.sourceforge.net/>
-
-          It is perfectly safe to say N here.
+source "fs/fat/Kconfig"
+source "fs/ntfs/Kconfig"
 
 endmenu
 endif # BLOCK
@@ -662,30 +141,7 @@ endif # BLOCK
 menu "Pseudo filesystems"
 
 source "fs/proc/Kconfig"
-
-config SYSFS
-        bool "sysfs file system support" if EMBEDDED
-        default y
-        help
-        The sysfs filesystem is a virtual filesystem that the kernel uses to
-        export internal kernel objects, their attributes, and their
-        relationships to one another.
-
-        Users can use sysfs to ascertain useful information about the running
-        kernel, such as the devices the kernel has discovered on each bus and
-        which driver each is bound to. sysfs can also be used to tune devices
-        and other kernel subsystems.
-
-        Some system agents rely on the information in sysfs to operate.
-        /sbin/hotplug uses device and object attributes in sysfs to assist in
-        delegating policy decisions, like persistently naming devices.
-
-        sysfs is currently used by the block subsystem to mount the root
-        partition.  If sysfs is disabled you must specify the boot device on
-        the kernel boot command line via its major and minor numbers.  For
-        example, "root=03:01" for /dev/hda1.
-
-        Designers of embedded systems may wish to say N here to conserve space.
+source "fs/sysfs/Kconfig"
 
 config TMPFS
         bool "Virtual memory file system support (former shm fs)"
@@ -726,17 +182,7 @@ config HUGETLBFS
 config HUGETLB_PAGE
         def_bool HUGETLBFS
 
-config CONFIGFS_FS
-        tristate "Userspace-driven configuration filesystem"
-        depends on SYSFS
-        help
-          configfs is a ram-based filesystem that provides the converse
-          of sysfs's functionality. Where sysfs is a filesystem-based
-          view of kernel objects, configfs is a filesystem-based manager
-          of kernel objects, or config_items.
-
-          Both sysfs and configfs can and should exist together on the
-          same system. One is not a replacement for the other.
+source "fs/configfs/Kconfig"
 
 endmenu
 
@@ -755,425 +201,27 @@ menuconfig MISC_FILESYSTEMS
 
 if MISC_FILESYSTEMS
 
-config ADFS_FS
-        tristate "ADFS file system support (EXPERIMENTAL)"
-        depends on BLOCK && EXPERIMENTAL
-        help
-          The Acorn Disc Filing System is the standard file system of the
-          RiscOS operating system which runs on Acorn's ARM-based Risc PC
-          systems and the Acorn Archimedes range of machines. If you say Y
-          here, Linux will be able to read from ADFS partitions on hard drives
-          and from ADFS-formatted floppy discs. If you also want to be able to
-          write to those devices, say Y to "ADFS write support" below.
-
-          The ADFS partition should be the first partition (i.e.,
-          /dev/[hs]d?1) on each of your drives. Please read the file
-          <file:Documentation/filesystems/adfs.txt> for further details.
-
-          To compile this code as a module, choose M here: the module will be
-          called adfs.
-
-          If unsure, say N.
-
-config ADFS_FS_RW
-        bool "ADFS write support (DANGEROUS)"
-        depends on ADFS_FS
-        help
-          If you say Y here, you will be able to write to ADFS partitions on
-          hard drives and ADFS-formatted floppy disks. This is experimental
-          codes, so if you're unsure, say N.
-
-config AFFS_FS
-        tristate "Amiga FFS file system support (EXPERIMENTAL)"
-        depends on BLOCK && EXPERIMENTAL
-        help
-          The Fast File System (FFS) is the common file system used on hard
-          disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20).  Say Y
-          if you want to be able to read and write files from and to an Amiga
-          FFS partition on your hard drive.  Amiga floppies however cannot be
-          read with this driver due to an incompatibility of the floppy
-          controller used in an Amiga and the standard floppy controller in
-          PCs and workstations. Read <file:Documentation/filesystems/affs.txt>
-          and <file:fs/affs/Changes>.
-
-          With this driver you can also mount disk files used by Bernd
-          Schmidt's Un*X Amiga Emulator
-          (<http://www.freiburg.linux.de/~uae/>).
-          If you want to do this, you will also need to say Y or M to "Loop
-          device support", above.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called affs.  If unsure, say N.
-
-config ECRYPT_FS
-        tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && KEYS && CRYPTO && NET
-        help
-          Encrypted filesystem that operates on the VFS layer.  See
-          <file:Documentation/filesystems/ecryptfs.txt> to learn more about
-          eCryptfs.  Userspace components are required and can be
-          obtained from <http://ecryptfs.sf.net>.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called ecryptfs.
-
-config HFS_FS
-        tristate "Apple Macintosh file system support (EXPERIMENTAL)"
-        depends on BLOCK && EXPERIMENTAL
-        select NLS
-        help
-          If you say Y here, you will be able to mount Macintosh-formatted
-          floppy disks and hard drive partitions with full read-write access.
-          Please read <file:Documentation/filesystems/hfs.txt> to learn about
-          the available mount options.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called hfs.
-
-config HFSPLUS_FS
-        tristate "Apple Extended HFS file system support"
-        depends on BLOCK
-        select NLS
-        select NLS_UTF8
-        help
-          If you say Y here, you will be able to mount extended format
-          Macintosh-formatted hard drive partitions with full read-write access.
-
-          This file system is often called HFS+ and was introduced with
-          MacOS 8. It includes all Mac specific filesystem data such as
-          data forks and creator codes, but it also has several UNIX
-          style features such as file ownership and permissions.
-
-config BEFS_FS
-        tristate "BeOS file system (BeFS) support (read only) (EXPERIMENTAL)"
-        depends on BLOCK && EXPERIMENTAL
-        select NLS
-        help
-          The BeOS File System (BeFS) is the native file system of Be, Inc's
-          BeOS. Notable features include support for arbitrary attributes
-          on files and directories, and database-like indices on selected
-          attributes. (Also note that this driver doesn't make those features
-          available at this time). It is a 64 bit filesystem, so it supports
-          extremely large volumes and files.
-
-          If you use this filesystem, you should also say Y to at least one
-          of the NLS (native language support) options below.
-
-          If you don't know what this is about, say N.
-
-          To compile this as a module, choose M here: the module will be
-          called befs.
-
-config BEFS_DEBUG
-        bool "Debug BeFS"
-        depends on BEFS_FS
-        help
-          If you say Y here, you can use the 'debug' mount option to enable
-          debugging output from the driver.
-
-config BFS_FS
-        tristate "BFS file system support (EXPERIMENTAL)"
-        depends on BLOCK && EXPERIMENTAL
-        help
-          Boot File System (BFS) is a file system used under SCO UnixWare to
-          allow the bootloader access to the kernel image and other important
-          files during the boot process.  It is usually mounted under /stand
-          and corresponds to the slice marked as "STAND" in the UnixWare
-          partition.  You should say Y if you want to read or write the files
-          on your /stand slice from within Linux.  You then also need to say Y
-          to "UnixWare slices support", below.  More information about the BFS
-          file system is contained in the file
-          <file:Documentation/filesystems/bfs.txt>.
-
-          If you don't know what this is about, say N.
-
-          To compile this as a module, choose M here: the module will be called
-          bfs.  Note that the file system of your root partition (the one
-          containing the directory /) cannot be compiled as a module.
-
-
-
-config EFS_FS
-        tristate "EFS file system support (read only) (EXPERIMENTAL)"
-        depends on BLOCK && EXPERIMENTAL
-        help
-          EFS is an older file system used for non-ISO9660 CD-ROMs and hard
-          disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer
-          uses the XFS file system for hard disk partitions however).
-
-          This implementation only offers read-only access. If you don't know
-          what all this is about, it's safe to say N. For more information
-          about EFS see its home page at <http://aeschi.ch.eu.org/efs/>.
-
-          To compile the EFS file system support as a module, choose M here: the
-          module will be called efs.
-
+source "fs/adfs/Kconfig"
+source "fs/affs/Kconfig"
+source "fs/ecryptfs/Kconfig"
+source "fs/hfs/Kconfig"
+source "fs/hfsplus/Kconfig"
+source "fs/befs/Kconfig"
+source "fs/bfs/Kconfig"
+source "fs/efs/Kconfig"
 source "fs/jffs2/Kconfig"
 # UBIFS File system configuration
 source "fs/ubifs/Kconfig"
-
-config CRAMFS
-        tristate "Compressed ROM file system support (cramfs)"
-        depends on BLOCK
-        select ZLIB_INFLATE
-        help
-          Saying Y here includes support for CramFs (Compressed ROM File
-          System).  CramFs is designed to be a simple, small, and compressed
-          file system for ROM based embedded systems.  CramFs is read-only,
-          limited to 256MB file systems (with 16MB files), and doesn't support
-          16/32 bits uid/gid, hard links and timestamps.
-
-          See <file:Documentation/filesystems/cramfs.txt> and
-          <file:fs/cramfs/README> for further information.
-
-          To compile this as a module, choose M here: the module will be called
-          cramfs.  Note that the root file system (the one containing the
-          directory /) cannot be compiled as a module.
-
-          If unsure, say N.
-
-config SQUASHFS
-        tristate "SquashFS 4.0 - Squashed file system support"
-        depends on BLOCK
-        select ZLIB_INFLATE
-        help
-          Saying Y here includes support for SquashFS 4.0 (a Compressed
-          Read-Only File System).  Squashfs is a highly compressed read-only
-          filesystem for Linux.  It uses zlib compression to compress both
-          files, inodes and directories.  Inodes in the system are very small
-          and all blocks are packed to minimise data overhead. Block sizes
-          greater than 4K are supported up to a maximum of 1 Mbytes (default
-          block size 128K).  SquashFS 4.0 supports 64 bit filesystems and files
-          (larger than 4GB), full uid/gid information, hard links and
-          timestamps.  
-
-          Squashfs is intended for general read-only filesystem use, for
-          archival use (i.e. in cases where a .tar.gz file may be used), and in
-          embedded systems where low overhead is needed.  Further information
-          and tools are available from http://squashfs.sourceforge.net.
-
-          If you want to compile this as a module ( = code which can be
-          inserted in and removed from the running kernel whenever you want),
-          say M here and read <file:Documentation/modules.txt>.  The module
-          will be called squashfs.  Note that the root file system (the one
-          containing the directory /) cannot be compiled as a module.
-
-          If unsure, say N.
-
-config SQUASHFS_EMBEDDED
-
-        bool "Additional option for memory-constrained systems" 
-        depends on SQUASHFS
-        default n
-        help
-          Saying Y here allows you to specify cache size.
-
-          If unsure, say N.
-
-config SQUASHFS_FRAGMENT_CACHE_SIZE
-        int "Number of fragments cached" if SQUASHFS_EMBEDDED
-        depends on SQUASHFS
-        default "3"
-        help
-          By default SquashFS caches the last 3 fragments read from
-          the filesystem.  Increasing this amount may mean SquashFS
-          has to re-read fragments less often from disk, at the expense
-          of extra system memory.  Decreasing this amount will mean
-          SquashFS uses less memory at the expense of extra reads from disk.
-
-          Note there must be at least one cached fragment.  Anything
-          much more than three will probably not make much difference.
-
-config VXFS_FS
-        tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
-        depends on BLOCK
-        help
-          FreeVxFS is a file system driver that support the VERITAS VxFS(TM)
-          file system format.  VERITAS VxFS(TM) is the standard file system
-          of SCO UnixWare (and possibly others) and optionally available
-          for Sunsoft Solaris, HP-UX and many other operating systems.
-          Currently only readonly access is supported.
-
-          NOTE: the file system type as used by mount(1), mount(2) and
-          fstab(5) is 'vxfs' as it describes the file system format, not
-          the actual driver.
-
-          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 OMFS_FS
-        tristate "SonicBlue Optimized MPEG File System support"
-        depends on BLOCK
-        select CRC_ITU_T
-        help
-          This is the proprietary file system used by the Rio Karma music
-          player and ReplayTV DVR.  Despite the name, this filesystem is not
-          more efficient than a standard FS for MPEG files, in fact likely
-          the opposite is true.  Say Y if you have either of these devices
-          and wish to mount its disk.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called omfs.  If unsure, say N.
-
-config HPFS_FS
-        tristate "OS/2 HPFS file system support"
-        depends on BLOCK
-        help
-          OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
-          is the file system used for organizing files on OS/2 hard disk
-          partitions. Say Y if you want to be able to read files from and
-          write files to an OS/2 HPFS partition on your hard drive. OS/2
-          floppies however are in regular MSDOS format, so you don't need this
-          option in order to be able to read them. Read
-          <file:Documentation/filesystems/hpfs.txt>.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called hpfs.  If unsure, say N.
-
-
-config QNX4FS_FS
-        tristate "QNX4 file system support (read only)"
-        depends on BLOCK
-        help
-          This is the file system used by the real-time operating systems
-          QNX 4 and QNX 6 (the latter is also called QNX RTP).
-          Further information is available at <http://www.qnx.com/>.
-          Say Y if you intend to mount QNX hard disks or floppies.
-          Unless you say Y to "QNX4FS read-write support" below, you will
-          only be able to read these file systems.
-
-          To compile this file system support as a module, choose M here: the
-          module will be called qnx4.
-
-          If you don't know whether you need it, then you don't need it:
-          answer N.
-
-config QNX4FS_RW
-        bool "QNX4FS write support (DANGEROUS)"
-        depends on QNX4FS_FS && EXPERIMENTAL && BROKEN
-        help
-          Say Y if you want to test write support for QNX4 file systems.
-
-          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
-        tristate "System V/Xenix/V7/Coherent file system support"
-        depends on BLOCK
-        help
-          SCO, Xenix and Coherent are commercial Unix systems for Intel
-          machines, and Version 7 was used on the DEC PDP-11. Saying Y
-          here would allow you to read from their floppies and hard disk
-          partitions.
-
-          If you have floppies or hard disk partitions like that, it is likely
-          that they contain binaries from those other Unix systems; in order
-          to run these binaries, you will want to install linux-abi which is
-          a set of kernel modules that lets you run SCO, Xenix, Wyse,
-          UnixWare, Dell Unix and System V programs under Linux.  It is
-          available via FTP (user: ftp) from
-          <ftp://ftp.openlinux.org/pub/people/hch/linux-abi/>).
-          NOTE: that will work only for binaries from Intel-based systems;
-          PDP ones will have to wait until somebody ports Linux to -11 ;-)
-
-          If you only intend to mount files from some other Unix over the
-          network using NFS, you don't need the System V file system support
-          (but you need NFS file system support obviously).
-
-          Note that this option is generally not needed for floppies, since a
-          good portable way to transport files and directories between unixes
-          (and even other operating systems) is given by the tar program ("man
-          tar" or preferably "info tar").  Note also that this option has
-          nothing whatsoever to do with the option "System V IPC". Read about
-          the System V file system in
-          <file:Documentation/filesystems/sysv-fs.txt>.
-          Saying Y here will enlarge your kernel by about 27 KB.
-
-          To compile this as a module, choose M here: the module will be called
-          sysv.
-
-          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
-        help
-          BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
-          OpenBSD and NeXTstep) use a file system called UFS. Some System V
-          Unixes can create and mount hard disk partitions and diskettes using
-          this file system as well. Saying Y here will allow you to read from
-          these partitions; if you also want to write to them, say Y to the
-          experimental "UFS file system write support", below. Please read the
-          file <file:Documentation/filesystems/ufs.txt> for more information.
-
-          The recently released UFS2 variant (used in FreeBSD 5.x) is
-          READ-ONLY supported.
-
-          Note that this option is generally not needed for floppies, since a
-          good portable way to transport files and directories between unixes
-          (and even other operating systems) is given by the tar program ("man
-          tar" or preferably "info tar").
-
-          When accessing NeXTstep files, you may need to convert them from the
-          NeXT character set to the Latin1 character set; use the program
-          recode ("info recode") for this purpose.
-
-          To compile the UFS file system support as a module, choose M here: the
-          module will be called ufs.
-
-          If you haven't heard about all of this before, it's safe to say N.
-
-config UFS_FS_WRITE
-        bool "UFS file system write support (DANGEROUS)"
-        depends on UFS_FS && EXPERIMENTAL
-        help
-          Say Y here if you want to try writing to UFS partitions. This is
-          experimental, so you should back up your UFS partitions beforehand.
-
-config UFS_DEBUG
-        bool "UFS debugging"
-        depends on UFS_FS
-        help
-          If you are experiencing any problems with the UFS filesystem, say
-          Y here.  This will result in _many_ additional debugging messages to be
-          written to the system log.
+source "fs/cramfs/Kconfig"
+source "fs/squashfs/Kconfig"
+source "fs/freevxfs/Kconfig"
+source "fs/minix/Kconfig"
+source "fs/omfs/Kconfig"
+source "fs/hpfs/Kconfig"
+source "fs/qnx4/Kconfig"
+source "fs/romfs/Kconfig"
+source "fs/sysv/Kconfig"
+source "fs/ufs/Kconfig"
 
 endif # MISC_FILESYSTEMS
 
@@ -1193,173 +241,8 @@ menuconfig NETWORK_FILESYSTEMS
 
 if NETWORK_FILESYSTEMS
 
-config NFS_FS
-        tristate "NFS client support"
-        depends on INET
-        select LOCKD
-        select SUNRPC
-        select NFS_ACL_SUPPORT if NFS_V3_ACL
-        help
-          Choose Y here if you want to access files residing on other
-          computers using Sun's Network File System protocol.  To compile
-          this file system support as a module, choose M here: the module
-          will be called nfs.
-
-          To mount file systems exported by NFS servers, you also need to
-          install the user space mount.nfs command which can be found in
-          the Linux nfs-utils package, available from http://linux-nfs.org/.
-          Information about using the mount command is available in the
-          mount(8) man page.  More detail about the Linux NFS client
-          implementation is available via the nfs(5) man page.
-
-          Below you can choose which versions of the NFS protocol are
-          available in the kernel to mount NFS servers.  Support for NFS
-          version 2 (RFC 1094) is always available when NFS_FS is selected.
-
-          To configure a system which mounts its root file system via NFS
-          at boot time, say Y here, select "Kernel level IP
-          autoconfiguration" in the NETWORK menu, and select "Root file
-          system on NFS" below.  You cannot compile this file system as a
-          module in this case.
-
-          If unsure, say N.
-
-config NFS_V3
-        bool "NFS client support for NFS version 3"
-        depends on NFS_FS
-        help
-          This option enables support for version 3 of the NFS protocol
-          (RFC 1813) in the kernel's NFS client.
-
-          If unsure, say Y.
-
-config NFS_V3_ACL
-        bool "NFS client support for the NFSv3 ACL protocol extension"
-        depends on NFS_V3
-        help
-          Some NFS servers support an auxiliary NFSv3 ACL protocol that
-          Sun added to Solaris but never became an official part of the
-          NFS version 3 protocol.  This protocol extension allows
-          applications on NFS clients to manipulate POSIX Access Control
-          Lists on files residing on NFS servers.  NFS servers enforce
-          ACLs on local files whether this protocol is available or not.
-
-          Choose Y here if your NFS server supports the Solaris NFSv3 ACL
-          protocol extension and you want your NFS client to allow
-          applications to access and modify ACLs on files on the server.
-
-          Most NFS servers don't support the Solaris NFSv3 ACL protocol
-          extension.  You can choose N here or specify the "noacl" mount
-          option to prevent your NFS client from trying to use the NFSv3
-          ACL protocol.
-
-          If unsure, say N.
-
-config NFS_V4
-        bool "NFS client support for NFS version 4 (EXPERIMENTAL)"
-        depends on NFS_FS && EXPERIMENTAL
-        select RPCSEC_GSS_KRB5
-        help
-          This option enables support for version 4 of the NFS protocol
-          (RFC 3530) in the kernel's NFS client.
-
-          To mount NFS servers using NFSv4, you also need to install user
-          space programs which can be found in the Linux nfs-utils package,
-          available from http://linux-nfs.org/.
-
-          If unsure, say N.
-
-config ROOT_NFS
-        bool "Root file system on NFS"
-        depends on NFS_FS=y && IP_PNP
-        help
-          If you want your system to mount its root file system via NFS,
-          choose Y here.  This is common practice for managing systems
-          without local permanent storage.  For details, read
-          <file:Documentation/filesystems/nfsroot.txt>.
-
-          Most people say N here.
-
-config NFSD
-        tristate "NFS server support"
-        depends on INET
-        select LOCKD
-        select SUNRPC
-        select EXPORTFS
-        select NFS_ACL_SUPPORT if NFSD_V2_ACL
-        help
-          Choose Y here if you want to allow other computers to access
-          files residing on this system using Sun's Network File System
-          protocol.  To compile the NFS server support as a module,
-          choose M here: the module will be called nfsd.
-
-          You may choose to use a user-space NFS server instead, in which
-          case you can choose N here.
-
-          To export local file systems using NFS, you also need to install
-          user space programs which can be found in the Linux nfs-utils
-          package, available from http://linux-nfs.org/.  More detail about
-          the Linux NFS server implementation is available via the
-          exports(5) man page.
-
-          Below you can choose which versions of the NFS protocol are
-          available to clients mounting the NFS server on this system.
-          Support for NFS version 2 (RFC 1094) is always available when
-          CONFIG_NFSD is selected.
-
-          If unsure, say N.
-
-config NFSD_V2_ACL
-        bool
-        depends on NFSD
-
-config NFSD_V3
-        bool "NFS server support for NFS version 3"
-        depends on NFSD
-        help
-          This option enables support in your system's NFS server for
-          version 3 of the NFS protocol (RFC 1813).
-
-          If unsure, say Y.
-
-config NFSD_V3_ACL
-        bool "NFS server support for the NFSv3 ACL protocol extension"
-        depends on NFSD_V3
-        select NFSD_V2_ACL
-        help
-          Solaris NFS servers support an auxiliary NFSv3 ACL protocol that
-          never became an official part of the NFS version 3 protocol.
-          This protocol extension allows applications on NFS clients to
-          manipulate POSIX Access Control Lists on files residing on NFS
-          servers.  NFS servers enforce POSIX ACLs on local files whether
-          this protocol is available or not.
-
-          This option enables support in your system's NFS server for the
-          NFSv3 ACL protocol extension allowing NFS clients to manipulate
-          POSIX ACLs on files exported by your system's NFS server.  NFS
-          clients which support the Solaris NFSv3 ACL protocol can then
-          access and modify ACLs on your NFS server.
-
-          To store ACLs on your NFS server, you also need to enable ACL-
-          related CONFIG options for your local file systems of choice.
-
-          If unsure, say N.
-
-config NFSD_V4
-        bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
-        depends on NFSD && PROC_FS && EXPERIMENTAL
-        select NFSD_V3
-        select FS_POSIX_ACL
-        select RPCSEC_GSS_KRB5
-        help
-          This option enables support in your system's NFS server for
-          version 4 of the NFS protocol (RFC 3530).
-
-          To export files using NFSv4, you need to install additional user
-          space programs which can be found in the Linux nfs-utils package,
-          available from http://linux-nfs.org/.
-
-          If unsure, say N.
+source "fs/nfs/Kconfig"
+source "fs/nfsd/Kconfig"
 
 config LOCKD
         tristate
@@ -1381,221 +264,13 @@ config NFS_COMMON
         depends on NFSD || NFS_FS
         default y
 
-config SUNRPC
-        tristate
-
-config SUNRPC_GSS
-        tristate
-
-config SUNRPC_XPRT_RDMA
-        tristate
-        depends on SUNRPC && INFINIBAND && EXPERIMENTAL
-        default SUNRPC && INFINIBAND
-        help
-          This option enables an RPC client transport capability that
-          allows the NFS client to mount servers via an RDMA-enabled
-          transport.
-
-          To compile RPC client RDMA transport support as a module,
-          choose M here: the module will be called xprtrdma.
-
-          If unsure, say N.
-
-config SUNRPC_REGISTER_V4
-        bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)"
-        depends on SUNRPC && EXPERIMENTAL
-        default n
-        help
-          Sun added support for registering RPC services at an IPv6
-          address by creating two new versions of the rpcbind protocol
-          (RFC 1833).
-
-          This option enables support in the kernel RPC server for
-          registering kernel RPC services via version 4 of the rpcbind
-          protocol.  If you enable this option, you must run a portmapper
-          daemon that supports rpcbind protocol version 4.
-
-          Serving NFS over IPv6 from knfsd (the kernel's NFS server)
-          requires that you enable this option and use a portmapper that
-          supports rpcbind version 4.
-
-          If unsure, say N to get traditional behavior (register kernel
-          RPC services using only rpcbind version 2).  Distributions
-          using the legacy Linux portmapper daemon must say N here.
-
-config RPCSEC_GSS_KRB5
-        tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
-        depends on SUNRPC && EXPERIMENTAL
-        select SUNRPC_GSS
-        select CRYPTO
-        select CRYPTO_MD5
-        select CRYPTO_DES
-        select CRYPTO_CBC
-        help
-          Choose Y here to enable Secure RPC using the Kerberos version 5
-          GSS-API mechanism (RFC 1964).
-
-          Secure RPC calls with Kerberos require an auxiliary user-space
-          daemon which may be found in the Linux nfs-utils package
-          available from http://linux-nfs.org/.  In addition, user-space
-          Kerberos support should be installed.
-
-          If unsure, say N.
-
-config RPCSEC_GSS_SPKM3
-        tristate "Secure RPC: SPKM3 mechanism (EXPERIMENTAL)"
-        depends on SUNRPC && EXPERIMENTAL
-        select SUNRPC_GSS
-        select CRYPTO
-        select CRYPTO_MD5
-        select CRYPTO_DES
-        select CRYPTO_CAST5
-        select CRYPTO_CBC
-        help
-          Choose Y here to enable Secure RPC using the SPKM3 public key
-          GSS-API mechansim (RFC 2025).
-
-          Secure RPC calls with SPKM3 require an auxiliary userspace
-          daemon which may be found in the Linux nfs-utils package
-          available from http://linux-nfs.org/.
-
-          If unsure, say N.
-
-config SMB_FS
-        tristate "SMB file system support (OBSOLETE, please use CIFS)"
-        depends on INET
-        select NLS
-        help
-          SMB (Server Message Block) is the protocol Windows for Workgroups
-          (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share
-          files and printers over local networks.  Saying Y here allows you to
-          mount their file systems (often called "shares" in this context) and
-          access them just like any other Unix directory.  Currently, this
-          works only if the Windows machines use TCP/IP as the underlying
-          transport protocol, and not NetBEUI.  For details, read
-          <file:Documentation/filesystems/smbfs.txt> and the SMB-HOWTO,
-          available from <http://www.tldp.org/docs.html#howto>.
-
-          Note: if you just want your box to act as an SMB *server* and make
-          files and printing services available to Windows clients (which need
-          to have a TCP/IP stack), you don't need to say Y here; you can use
-          the program SAMBA (available from <ftp://ftp.samba.org/pub/samba/>)
-          for that.
-
-          General information about how to connect Linux, Windows machines and
-          Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
-
-          To compile the SMB support as a module, choose M here:
-          the module will be called smbfs.  Most people say N, however.
-
-config SMB_NLS_DEFAULT
-        bool "Use a default NLS"
-        depends on SMB_FS
-        help
-          Enabling this will make smbfs use nls translations by default. You
-          need to specify the local charset (CONFIG_NLS_DEFAULT) in the nls
-          settings and you need to give the default nls for the SMB server as
-          CONFIG_SMB_NLS_REMOTE.
-
-          The nls settings can be changed at mount time, if your smbmount
-          supports that, using the codepage and iocharset parameters.
-
-          smbmount from samba 2.2.0 or later supports this.
-
-config SMB_NLS_REMOTE
-        string "Default Remote NLS Option"
-        depends on SMB_NLS_DEFAULT
-        default "cp437"
-        help
-          This setting allows you to specify a default value for which
-          codepage the server uses. If this field is left blank no
-          translations will be done by default. The local codepage/charset
-          default to CONFIG_NLS_DEFAULT.
-
-          The nls settings can be changed at mount time, if your smbmount
-          supports that, using the codepage and iocharset parameters.
-
-          smbmount from samba 2.2.0 or later supports this.
-
+source "net/sunrpc/Kconfig"
+source "fs/smbfs/Kconfig"
 source "fs/cifs/Kconfig"
-
-config NCP_FS
-        tristate "NCP file system support (to mount NetWare volumes)"
-        depends on IPX!=n || INET
-        help
-          NCP (NetWare Core Protocol) is a protocol that runs over IPX and is
-          used by Novell NetWare clients to talk to file servers.  It is to
-          IPX what NFS is to TCP/IP, if that helps.  Saying Y here allows you
-          to mount NetWare file server volumes and to access them just like
-          any other Unix directory.  For details, please read the file
-          <file:Documentation/filesystems/ncpfs.txt> in the kernel source and
-          the IPX-HOWTO from <http://www.tldp.org/docs.html#howto>.
-
-          You do not have to say Y here if you want your Linux box to act as a
-          file *server* for Novell NetWare clients.
-
-          General information about how to connect Linux, Windows machines and
-          Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
-
-          To compile this as a module, choose M here: the module will be called
-          ncpfs.  Say N unless you are connected to a Novell network.
-
 source "fs/ncpfs/Kconfig"
-
-config CODA_FS
-        tristate "Coda file system support (advanced network fs)"
-        depends on INET
-        help
-          Coda is an advanced network file system, similar to NFS in that it
-          enables you to mount file systems of a remote server and access them
-          with regular Unix commands as if they were sitting on your hard
-          disk.  Coda has several advantages over NFS: support for
-          disconnected operation (e.g. for laptops), read/write server
-          replication, security model for authentication and encryption,
-          persistent client caches and write back caching.
-
-          If you say Y here, your Linux box will be able to act as a Coda
-          *client*.  You will need user level code as well, both for the
-          client and server.  Servers are currently user level, i.e. they need
-          no kernel support.  Please read
-          <file:Documentation/filesystems/coda.txt> and check out the Coda
-          home page <http://www.coda.cs.cmu.edu/>.
-
-          To compile the coda client support as a module, choose M here: the
-          module will be called coda.
-
-config AFS_FS
-        tristate "Andrew File System support (AFS) (EXPERIMENTAL)"
-        depends on INET && EXPERIMENTAL
-        select AF_RXRPC
-        help
-          If you say Y here, you will get an experimental Andrew File System
-          driver. It currently only supports unsecured read-only AFS access.
-
-          See <file:Documentation/filesystems/afs.txt> for more information.
-
-          If unsure, say N.
-
-config AFS_DEBUG
-        bool "AFS dynamic debugging"
-        depends on AFS_FS
-        help
-          Say Y here to make runtime controllable debugging messages appear.
-
-          See <file:Documentation/filesystems/afs.txt> for more information.
-
-          If unsure, say N.
-
-config 9P_FS
-        tristate "Plan 9 Resource Sharing Support (9P2000) (Experimental)"
-        depends on INET && NET_9P && EXPERIMENTAL
-        help
-          If you say Y here, you will get experimental support for
-          Plan 9 resource sharing via the 9P2000 protocol.
-
-          See <http://v9fs.sf.net> for more information.
-
-          If unsure, say N.
+source "fs/coda/Kconfig"
+source "fs/afs/Kconfig"
+source "fs/9p/Kconfig"
 
 endif # NETWORK_FILESYSTEMS
 
diff --git a/fs/adfs/Kconfig b/fs/adfs/Kconfig
new file mode 100644
index 000000000000..e55182a74605
--- /dev/null
+++ b/fs/adfs/Kconfig
@@ -0,0 +1,27 @@
+config ADFS_FS
+        tristate "ADFS file system support (EXPERIMENTAL)"
+        depends on BLOCK && EXPERIMENTAL
+        help
+          The Acorn Disc Filing System is the standard file system of the
+          RiscOS operating system which runs on Acorn's ARM-based Risc PC
+          systems and the Acorn Archimedes range of machines. If you say Y
+          here, Linux will be able to read from ADFS partitions on hard drives
+          and from ADFS-formatted floppy discs. If you also want to be able to
+          write to those devices, say Y to "ADFS write support" below.
+
+          The ADFS partition should be the first partition (i.e.,
+          /dev/[hs]d?1) on each of your drives. Please read the file
+          <file:Documentation/filesystems/adfs.txt> for further details.
+
+          To compile this code as a module, choose M here: the module will be
+          called adfs.
+
+          If unsure, say N.
+
+config ADFS_FS_RW
+        bool "ADFS write support (DANGEROUS)"
+        depends on ADFS_FS
+        help
+          If you say Y here, you will be able to write to ADFS partitions on
+          hard drives and ADFS-formatted floppy disks. This is experimental
+          codes, so if you're unsure, say N.
diff --git a/fs/affs/Kconfig b/fs/affs/Kconfig
new file mode 100644
index 000000000000..cfad9afb4762
--- /dev/null
+++ b/fs/affs/Kconfig
@@ -0,0 +1,21 @@
+config AFFS_FS
+        tristate "Amiga FFS file system support (EXPERIMENTAL)"
+        depends on BLOCK && EXPERIMENTAL
+        help
+          The Fast File System (FFS) is the common file system used on hard
+          disks by Amiga(tm) systems since AmigaOS Version 1.3 (34.20).  Say Y
+          if you want to be able to read and write files from and to an Amiga
+          FFS partition on your hard drive.  Amiga floppies however cannot be
+          read with this driver due to an incompatibility of the floppy
+          controller used in an Amiga and the standard floppy controller in
+          PCs and workstations. Read <file:Documentation/filesystems/affs.txt>
+          and <file:fs/affs/Changes>.
+
+          With this driver you can also mount disk files used by Bernd
+          Schmidt's Un*X Amiga Emulator
+          (<http://www.freiburg.linux.de/~uae/>).
+          If you want to do this, you will also need to say Y or M to "Loop
+          device support", above.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called affs.  If unsure, say N.
diff --git a/fs/afs/Kconfig b/fs/afs/Kconfig
new file mode 100644
index 000000000000..e7b522fe15e1
--- /dev/null
+++ b/fs/afs/Kconfig
@@ -0,0 +1,21 @@
+config AFS_FS
+        tristate "Andrew File System support (AFS) (EXPERIMENTAL)"
+        depends on INET && EXPERIMENTAL
+        select AF_RXRPC
+        help
+          If you say Y here, you will get an experimental Andrew File System
+          driver. It currently only supports unsecured read-only AFS access.
+
+          See <file:Documentation/filesystems/afs.txt> for more information.
+
+          If unsure, say N.
+
+config AFS_DEBUG
+        bool "AFS dynamic debugging"
+        depends on AFS_FS
+        help
+          Say Y here to make runtime controllable debugging messages appear.
+
+          See <file:Documentation/filesystems/afs.txt> for more information.
+
+          If unsure, say N.
diff --git a/fs/autofs/Kconfig b/fs/autofs/Kconfig
new file mode 100644
index 000000000000..5f3bea90911e
--- /dev/null
+++ b/fs/autofs/Kconfig
@@ -0,0 +1,21 @@
+config AUTOFS_FS
+        tristate "Kernel automounter support"
+        help
+          The automounter is a tool to automatically mount remote file systems
+          on demand. This implementation is partially kernel-based to reduce
+          overhead in the already-mounted case; this is unlike the BSD
+          automounter (amd), which is a pure user space daemon.
+
+          To use the automounter you need the user-space tools from the autofs
+          package; you can find the location in <file:Documentation/Changes>.
+          You also want to answer Y to "NFS file system support", below.
+
+          If you want to use the newer version of the automounter with more
+          features, say N here and say Y to "Kernel automounter v4 support",
+          below.
+
+          To compile this support as a module, choose M here: the module will be
+          called autofs.
+
+          If you are not a part of a fairly large, distributed network, you
+          probably do not need an automounter, and can say N here.
diff --git a/fs/autofs4/Kconfig b/fs/autofs4/Kconfig
new file mode 100644
index 000000000000..1204d6384d39
--- /dev/null
+++ b/fs/autofs4/Kconfig
@@ -0,0 +1,20 @@
+config AUTOFS4_FS
+        tristate "Kernel automounter version 4 support (also supports v3)"
+        help
+          The automounter is a tool to automatically mount remote file systems
+          on demand. This implementation is partially kernel-based to reduce
+          overhead in the already-mounted case; this is unlike the BSD
+          automounter (amd), which is a pure user space daemon.
+
+          To use the automounter you need the user-space tools from
+          <ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/>; you also
+          want to answer Y to "NFS file system support", below.
+
+          To compile this support as a module, choose M here: the module will be
+          called autofs4.  You will need to add "alias autofs autofs4" to your
+          modules configuration file.
+
+          If you are not a part of a fairly large, distributed network or
+          don't have a laptop which needs to dynamically reconfigure to the
+          local network, you probably do not need an automounter, and can say
+          N here.
diff --git a/fs/befs/Kconfig b/fs/befs/Kconfig
new file mode 100644
index 000000000000..7835d30f211f
--- /dev/null
+++ b/fs/befs/Kconfig
@@ -0,0 +1,26 @@
+config BEFS_FS
+        tristate "BeOS file system (BeFS) support (read only) (EXPERIMENTAL)"
+        depends on BLOCK && EXPERIMENTAL
+        select NLS
+        help
+          The BeOS File System (BeFS) is the native file system of Be, Inc's
+          BeOS. Notable features include support for arbitrary attributes
+          on files and directories, and database-like indices on selected
+          attributes. (Also note that this driver doesn't make those features
+          available at this time). It is a 64 bit filesystem, so it supports
+          extremely large volumes and files.
+
+          If you use this filesystem, you should also say Y to at least one
+          of the NLS (native language support) options below.
+
+          If you don't know what this is about, say N.
+
+          To compile this as a module, choose M here: the module will be
+          called befs.
+
+config BEFS_DEBUG
+        bool "Debug BeFS"
+        depends on BEFS_FS
+        help
+          If you say Y here, you can use the 'debug' mount option to enable
+          debugging output from the driver.
diff --git a/fs/bfs/Kconfig b/fs/bfs/Kconfig
new file mode 100644
index 000000000000..c2336c62024f
--- /dev/null
+++ b/fs/bfs/Kconfig
@@ -0,0 +1,19 @@
+config BFS_FS
+        tristate "BFS file system support (EXPERIMENTAL)"
+        depends on BLOCK && EXPERIMENTAL
+        help
+          Boot File System (BFS) is a file system used under SCO UnixWare to
+          allow the bootloader access to the kernel image and other important
+          files during the boot process.  It is usually mounted under /stand
+          and corresponds to the slice marked as "STAND" in the UnixWare
+          partition.  You should say Y if you want to read or write the files
+          on your /stand slice from within Linux.  You then also need to say Y
+          to "UnixWare slices support", below.  More information about the BFS
+          file system is contained in the file
+          <file:Documentation/filesystems/bfs.txt>.
+
+          If you don't know what this is about, say N.
+
+          To compile this as a module, choose M here: the module will be called
+          bfs.  Note that the file system of your root partition (the one
+          containing the directory /) cannot be compiled as a module.
diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig
new file mode 100644
index 000000000000..f8fcf999ea1b
--- /dev/null
+++ b/fs/btrfs/Kconfig
@@ -0,0 +1,18 @@
+config BTRFS_FS
+        tristate "Btrfs filesystem (EXPERIMENTAL) Unstable disk format"
+        depends on EXPERIMENTAL
+        select LIBCRC32C
+        select ZLIB_INFLATE
+        select ZLIB_DEFLATE
+        help
+          Btrfs is a new filesystem with extents, writable snapshotting,
+          support for multiple devices and many more features.
+
+          Btrfs is highly experimental, and THE DISK FORMAT IS NOT YET
+          FINALIZED.  You should say N here unless you are interested in
+          testing Btrfs with non-critical data.
+
+          To compile this file system support as a module, choose M here. The
+          module will be called btrfs.
+
+          If unsure, say N.
diff --git a/fs/coda/Kconfig b/fs/coda/Kconfig
new file mode 100644
index 000000000000..c0e5a7fad06d
--- /dev/null
+++ b/fs/coda/Kconfig
@@ -0,0 +1,21 @@
+config CODA_FS
+        tristate "Coda file system support (advanced network fs)"
+        depends on INET
+        help
+          Coda is an advanced network file system, similar to NFS in that it
+          enables you to mount file systems of a remote server and access them
+          with regular Unix commands as if they were sitting on your hard
+          disk.  Coda has several advantages over NFS: support for
+          disconnected operation (e.g. for laptops), read/write server
+          replication, security model for authentication and encryption,
+          persistent client caches and write back caching.
+
+          If you say Y here, your Linux box will be able to act as a Coda
+          *client*.  You will need user level code as well, both for the
+          client and server.  Servers are currently user level, i.e. they need
+          no kernel support.  Please read
+          <file:Documentation/filesystems/coda.txt> and check out the Coda
+          home page <http://www.coda.cs.cmu.edu/>.
+
+          To compile the coda client support as a module, choose M here: the
+          module will be called coda.
diff --git a/fs/configfs/Kconfig b/fs/configfs/Kconfig
new file mode 100644
index 000000000000..13587cc97a0b
--- /dev/null
+++ b/fs/configfs/Kconfig
@@ -0,0 +1,11 @@
+config CONFIGFS_FS
+        tristate "Userspace-driven configuration filesystem"
+        depends on SYSFS
+        help
+          configfs is a ram-based filesystem that provides the converse
+          of sysfs's functionality. Where sysfs is a filesystem-based
+          view of kernel objects, configfs is a filesystem-based manager
+          of kernel objects, or config_items.
+
+          Both sysfs and configfs can and should exist together on the
+          same system. One is not a replacement for the other.
diff --git a/fs/cramfs/Kconfig b/fs/cramfs/Kconfig
new file mode 100644
index 000000000000..cd06466f365e
--- /dev/null
+++ b/fs/cramfs/Kconfig
@@ -0,0 +1,19 @@
+config CRAMFS
+        tristate "Compressed ROM file system support (cramfs)"
+        depends on BLOCK
+        select ZLIB_INFLATE
+        help
+          Saying Y here includes support for CramFs (Compressed ROM File
+          System).  CramFs is designed to be a simple, small, and compressed
+          file system for ROM based embedded systems.  CramFs is read-only,
+          limited to 256MB file systems (with 16MB files), and doesn't support
+          16/32 bits uid/gid, hard links and timestamps.
+
+          See <file:Documentation/filesystems/cramfs.txt> and
+          <file:fs/cramfs/README> for further information.
+
+          To compile this as a module, choose M here: the module will be called
+          cramfs.  Note that the root file system (the one containing the
+          directory /) cannot be compiled as a module.
+
+          If unsure, say N.
diff --git a/fs/ecryptfs/Kconfig b/fs/ecryptfs/Kconfig
new file mode 100644
index 000000000000..0c754e64232b
--- /dev/null
+++ b/fs/ecryptfs/Kconfig
@@ -0,0 +1,11 @@
+config ECRYPT_FS
+        tristate "eCrypt filesystem layer support (EXPERIMENTAL)"
+        depends on EXPERIMENTAL && KEYS && CRYPTO && NET
+        help
+          Encrypted filesystem that operates on the VFS layer.  See
+          <file:Documentation/filesystems/ecryptfs.txt> to learn more about
+          eCryptfs.  Userspace components are required and can be
+          obtained from <http://ecryptfs.sf.net>.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called ecryptfs.
diff --git a/fs/efs/Kconfig b/fs/efs/Kconfig
new file mode 100644
index 000000000000..6ebfc1c207a8
--- /dev/null
+++ b/fs/efs/Kconfig
@@ -0,0 +1,14 @@
+config EFS_FS
+        tristate "EFS file system support (read only) (EXPERIMENTAL)"
+        depends on BLOCK && EXPERIMENTAL
+        help
+          EFS is an older file system used for non-ISO9660 CD-ROMs and hard
+          disk partitions by SGI's IRIX operating system (IRIX 6.0 and newer
+          uses the XFS file system for hard disk partitions however).
+
+          This implementation only offers read-only access. If you don't know
+          what all this is about, it's safe to say N. For more information
+          about EFS see its home page at <http://aeschi.ch.eu.org/efs/>.
+
+          To compile the EFS file system support as a module, choose M here: the
+          module will be called efs.
diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig
new file mode 100644
index 000000000000..d0a69ff25375
--- /dev/null
+++ b/fs/fat/Kconfig
@@ -0,0 +1,97 @@
+config FAT_FS
+        tristate
+        select NLS
+        help
+          If you want to use one of the FAT-based file systems (the MS-DOS and
+          VFAT (Windows 95) file systems), then you must say Y or M here
+          to include FAT support. You will then be able to mount partitions or
+          diskettes with FAT-based file systems and transparently access the
+          files on them, i.e. MSDOS files will look and behave just like all
+          other Unix files.
+
+          This FAT support is not a file system in itself, it only provides
+          the foundation for the other file systems. You will have to say Y or
+          M to at least one of "MSDOS fs support" or "VFAT fs support" in
+          order to make use of it.
+
+          Another way to read and write MSDOS floppies and hard drive
+          partitions from within Linux (but not transparently) is with the
+          mtools ("man mtools") program suite. You don't need to say Y here in
+          order to do that.
+
+          If you need to move large files on floppies between a DOS and a
+          Linux box, say Y here, mount the floppy under Linux with an MSDOS
+          file system and use GNU tar's M option. GNU tar is a program
+          available for Unix and DOS ("man tar" or "info tar").
+
+          The FAT support will enlarge your kernel by about 37 KB. If unsure,
+          say Y.
+
+          To compile this as a module, choose M here: the module will be called
+          fat.  Note that if you compile the FAT support as a module, you
+          cannot compile any of the FAT-based file systems into the kernel
+          -- they will have to be modules as well.
+
+config MSDOS_FS
+        tristate "MSDOS fs support"
+        select FAT_FS
+        help
+          This allows you to mount MSDOS partitions of your hard drive (unless
+          they are compressed; to access compressed MSDOS partitions under
+          Linux, you can either use the DOS emulator DOSEMU, described in the
+          DOSEMU-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>, or try dmsdosfs in
+          <ftp://ibiblio.org/pub/Linux/system/filesystems/dosfs/>. If you
+          intend to use dosemu with a non-compressed MSDOS partition, say Y
+          here) and MSDOS floppies. This means that file access becomes
+          transparent, i.e. the MSDOS files look and behave just like all
+          other Unix files.
+
+          If you have Windows 95 or Windows NT installed on your MSDOS
+          partitions, you should use the VFAT file system (say Y to "VFAT fs
+          support" below), or you will not be able to see the long filenames
+          generated by Windows 95 / Windows NT.
+
+          This option will enlarge your kernel by about 7 KB. If unsure,
+          answer Y. This will only work if you said Y to "DOS FAT fs support"
+          as well. To compile this as a module, choose M here: the module will
+          be called msdos.
+
+config VFAT_FS
+        tristate "VFAT (Windows-95) fs support"
+        select FAT_FS
+        help
+          This option provides support for normal Windows file systems with
+          long filenames.  That includes non-compressed FAT-based file systems
+          used by Windows 95, Windows 98, Windows NT 4.0, and the Unix
+          programs from the mtools package.
+
+          The VFAT support enlarges your kernel by about 10 KB and it only
+          works if you said Y to the "DOS FAT fs support" above.  Please read
+          the file <file:Documentation/filesystems/vfat.txt> for details.  If
+          unsure, say Y.
+
+          To compile this as a module, choose M here: the module will be called
+          vfat.
+
+config FAT_DEFAULT_CODEPAGE
+        int "Default codepage for FAT"
+        depends on MSDOS_FS || VFAT_FS
+        default 437
+        help
+          This option should be set to the codepage of your FAT filesystems.
+          It can be overridden with the "codepage" mount option.
+          See <file:Documentation/filesystems/vfat.txt> for more information.
+
+config FAT_DEFAULT_IOCHARSET
+        string "Default iocharset for FAT"
+        depends on VFAT_FS
+        default "iso8859-1"
+        help
+          Set this to the default input/output character set you'd
+          like FAT to use. It should probably match the character set
+          that most of your FAT filesystems use, and can be overridden
+          with the "iocharset" mount option for FAT filesystems.
+          Note that "utf8" is not recommended for FAT filesystems.
+          If unsure, you shouldn't set "utf8" here.
+          See <file:Documentation/filesystems/vfat.txt> for more information.
diff --git a/fs/freevxfs/Kconfig b/fs/freevxfs/Kconfig
new file mode 100644
index 000000000000..8dc1cd5c1efe
--- /dev/null
+++ b/fs/freevxfs/Kconfig
@@ -0,0 +1,16 @@
+config VXFS_FS
+        tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)"
+        depends on BLOCK
+        help
+          FreeVxFS is a file system driver that support the VERITAS VxFS(TM)
+          file system format.  VERITAS VxFS(TM) is the standard file system
+          of SCO UnixWare (and possibly others) and optionally available
+          for Sunsoft Solaris, HP-UX and many other operating systems.
+          Currently only readonly access is supported.
+
+          NOTE: the file system type as used by mount(1), mount(2) and
+          fstab(5) is 'vxfs' as it describes the file system format, not
+          the actual driver.
+
+          To compile this as a module, choose M here: the module will be
+          called freevxfs.  If unsure, say N.
diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig
new file mode 100644
index 000000000000..0cf160a94eda
--- /dev/null
+++ b/fs/fuse/Kconfig
@@ -0,0 +1,15 @@
+config FUSE_FS
+        tristate "FUSE (Filesystem in Userspace) support"
+        help
+          With FUSE it is possible to implement a fully functional filesystem
+          in a userspace program.
+
+          There's also companion library: libfuse.  This library along with
+          utilities is available from the FUSE homepage:
+          <http://fuse.sourceforge.net/>
+
+          See <file:Documentation/filesystems/fuse.txt> for more information.
+          See <file:Documentation/Changes> for needed library/utility version.
+
+          If you want to develop a userspace FS, or if you want to use
+          a filesystem based on FUSE, answer Y or M.
diff --git a/fs/hfs/Kconfig b/fs/hfs/Kconfig
new file mode 100644
index 000000000000..b77c5bc20f8a
--- /dev/null
+++ b/fs/hfs/Kconfig
@@ -0,0 +1,12 @@
+config HFS_FS
+        tristate "Apple Macintosh file system support (EXPERIMENTAL)"
+        depends on BLOCK && EXPERIMENTAL
+        select NLS
+        help
+          If you say Y here, you will be able to mount Macintosh-formatted
+          floppy disks and hard drive partitions with full read-write access.
+          Please read <file:Documentation/filesystems/hfs.txt> to learn about
+          the available mount options.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called hfs.
diff --git a/fs/hfsplus/Kconfig b/fs/hfsplus/Kconfig
new file mode 100644
index 000000000000..a63371815aab
--- /dev/null
+++ b/fs/hfsplus/Kconfig
@@ -0,0 +1,13 @@
+config HFSPLUS_FS
+        tristate "Apple Extended HFS file system support"
+        depends on BLOCK
+        select NLS
+        select NLS_UTF8
+        help
+          If you say Y here, you will be able to mount extended format
+          Macintosh-formatted hard drive partitions with full read-write access.
+
+          This file system is often called HFS+ and was introduced with
+          MacOS 8. It includes all Mac specific filesystem data such as
+          data forks and creator codes, but it also has several UNIX
+          style features such as file ownership and permissions.
diff --git a/fs/hpfs/Kconfig b/fs/hpfs/Kconfig
new file mode 100644
index 000000000000..56bd15c5bf6c
--- /dev/null
+++ b/fs/hpfs/Kconfig
@@ -0,0 +1,14 @@
+config HPFS_FS
+        tristate "OS/2 HPFS file system support"
+        depends on BLOCK
+        help
+          OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
+          is the file system used for organizing files on OS/2 hard disk
+          partitions. Say Y if you want to be able to read files from and
+          write files to an OS/2 HPFS partition on your hard drive. OS/2
+          floppies however are in regular MSDOS format, so you don't need this
+          option in order to be able to read them. Read
+          <file:Documentation/filesystems/hpfs.txt>.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called hpfs.  If unsure, say N.
diff --git a/fs/isofs/Kconfig b/fs/isofs/Kconfig
new file mode 100644
index 000000000000..8ab9878e3671
--- /dev/null
+++ b/fs/isofs/Kconfig
@@ -0,0 +1,39 @@
+config ISO9660_FS
+        tristate "ISO 9660 CDROM file system support"
+        help
+          This is the standard file system used on CD-ROMs.  It was previously
+          known as "High Sierra File System" and is called "hsfs" on other
+          Unix systems.  The so-called Rock-Ridge extensions which allow for
+          long Unix filenames and symbolic links are also supported by this
+          driver.  If you have a CD-ROM drive and want to do more with it than
+          just listen to audio CDs and watch its LEDs, say Y (and read
+          <file:Documentation/filesystems/isofs.txt> and the CD-ROM-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>), thereby
+          enlarging your kernel by about 27 KB; otherwise say N.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called isofs.
+
+config JOLIET
+        bool "Microsoft Joliet CDROM extensions"
+        depends on ISO9660_FS
+        select NLS
+        help
+          Joliet is a Microsoft extension for the ISO 9660 CD-ROM file system
+          which allows for long filenames in unicode format (unicode is the
+          new 16 bit character code, successor to ASCII, which encodes the
+          characters of almost all languages of the world; see
+          <http://www.unicode.org/> for more information).  Say Y here if you
+          want to be able to read Joliet CD-ROMs under Linux.
+
+config ZISOFS
+        bool "Transparent decompression extension"
+        depends on ISO9660_FS
+        select ZLIB_INFLATE
+        help
+          This is a Linux-specific extension to RockRidge which lets you store
+          data in compressed form on a CD-ROM and have it transparently
+          decompressed when the CD-ROM is accessed.  See
+          <http://www.kernel.org/pub/linux/utils/fs/zisofs/> for the tools
+          necessary to create such a filesystem.  Say Y here if you want to be
+          able to read such compressed CD-ROMs.
diff --git a/fs/jfs/Kconfig b/fs/jfs/Kconfig
new file mode 100644
index 000000000000..9ff619a6f9cc
--- /dev/null
+++ b/fs/jfs/Kconfig
@@ -0,0 +1,49 @@
+config JFS_FS
+        tristate "JFS filesystem support"
+        select NLS
+        help
+          This is a port of IBM's Journaled Filesystem .  More information is
+          available in the file <file:Documentation/filesystems/jfs.txt>.
+
+          If you do not intend to use the JFS filesystem, say N.
+
+config JFS_POSIX_ACL
+        bool "JFS POSIX Access Control Lists"
+        depends on JFS_FS
+        select FS_POSIX_ACL
+        help
+          Posix Access Control Lists (ACLs) support permissions for users and
+          groups beyond the owner/group/world scheme.
+
+          To learn more about Access Control Lists, visit the Posix ACLs for
+          Linux website <http://acl.bestbits.at/>.
+
+          If you don't know what Access Control Lists are, say N
+
+config JFS_SECURITY
+        bool "JFS Security Labels"
+        depends on JFS_FS
+        help
+          Security labels support alternative access control models
+          implemented by security modules like SELinux.  This option
+          enables an extended attribute handler for file security
+          labels in the jfs filesystem.
+
+          If you are not using a security module that requires using
+          extended attributes for file security labels, say N.
+
+config JFS_DEBUG
+        bool "JFS debugging"
+        depends on JFS_FS
+        help
+          If you are experiencing any problems with the JFS filesystem, say
+          Y here.  This will result in additional debugging messages to be
+          written to the system log.  Under normal circumstances, this
+          results in very little overhead.
+
+config JFS_STATISTICS
+        bool "JFS statistics"
+        depends on JFS_FS
+        help
+          Enabling this option will cause statistics from the JFS file system
+          to be made available to the user in the /proc/fs/jfs/ directory.
diff --git a/fs/minix/Kconfig b/fs/minix/Kconfig
new file mode 100644
index 000000000000..0fd7ca994264
--- /dev/null
+++ b/fs/minix/Kconfig
@@ -0,0 +1,17 @@
+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.
diff --git a/fs/ncpfs/Kconfig b/fs/ncpfs/Kconfig
index 142808427b25..c931cf22a1f6 100644
--- a/fs/ncpfs/Kconfig
+++ b/fs/ncpfs/Kconfig
@@ -1,6 +1,27 @@
 #
 # NCP Filesystem configuration
 #
+config NCP_FS
+        tristate "NCP file system support (to mount NetWare volumes)"
+        depends on IPX!=n || INET
+        help
+          NCP (NetWare Core Protocol) is a protocol that runs over IPX and is
+          used by Novell NetWare clients to talk to file servers.  It is to
+          IPX what NFS is to TCP/IP, if that helps.  Saying Y here allows you
+          to mount NetWare file server volumes and to access them just like
+          any other Unix directory.  For details, please read the file
+          <file:Documentation/filesystems/ncpfs.txt> in the kernel source and
+          the IPX-HOWTO from <http://www.tldp.org/docs.html#howto>.
+
+          You do not have to say Y here if you want your Linux box to act as a
+          file *server* for Novell NetWare clients.
+
+          General information about how to connect Linux, Windows machines and
+          Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
+
+          To compile this as a module, choose M here: the module will be called
+          ncpfs.  Say N unless you are connected to a Novell network.
+
 config NCPFS_PACKET_SIGNING
         bool "Packet signatures"
         depends on NCP_FS
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
new file mode 100644
index 000000000000..36fe20d6eba2
--- /dev/null
+++ b/fs/nfs/Kconfig
@@ -0,0 +1,86 @@
+config NFS_FS
+        tristate "NFS client support"
+        depends on INET
+        select LOCKD
+        select SUNRPC
+        select NFS_ACL_SUPPORT if NFS_V3_ACL
+        help
+          Choose Y here if you want to access files residing on other
+          computers using Sun's Network File System protocol.  To compile
+          this file system support as a module, choose M here: the module
+          will be called nfs.
+
+          To mount file systems exported by NFS servers, you also need to
+          install the user space mount.nfs command which can be found in
+          the Linux nfs-utils package, available from http://linux-nfs.org/.
+          Information about using the mount command is available in the
+          mount(8) man page.  More detail about the Linux NFS client
+          implementation is available via the nfs(5) man page.
+
+          Below you can choose which versions of the NFS protocol are
+          available in the kernel to mount NFS servers.  Support for NFS
+          version 2 (RFC 1094) is always available when NFS_FS is selected.
+
+          To configure a system which mounts its root file system via NFS
+          at boot time, say Y here, select "Kernel level IP
+          autoconfiguration" in the NETWORK menu, and select "Root file
+          system on NFS" below.  You cannot compile this file system as a
+          module in this case.
+
+          If unsure, say N.
+
+config NFS_V3
+        bool "NFS client support for NFS version 3"
+        depends on NFS_FS
+        help
+          This option enables support for version 3 of the NFS protocol
+          (RFC 1813) in the kernel's NFS client.
+
+          If unsure, say Y.
+
+config NFS_V3_ACL
+        bool "NFS client support for the NFSv3 ACL protocol extension"
+        depends on NFS_V3
+        help
+          Some NFS servers support an auxiliary NFSv3 ACL protocol that
+          Sun added to Solaris but never became an official part of the
+          NFS version 3 protocol.  This protocol extension allows
+          applications on NFS clients to manipulate POSIX Access Control
+          Lists on files residing on NFS servers.  NFS servers enforce
+          ACLs on local files whether this protocol is available or not.
+
+          Choose Y here if your NFS server supports the Solaris NFSv3 ACL
+          protocol extension and you want your NFS client to allow
+          applications to access and modify ACLs on files on the server.
+
+          Most NFS servers don't support the Solaris NFSv3 ACL protocol
+          extension.  You can choose N here or specify the "noacl" mount
+          option to prevent your NFS client from trying to use the NFSv3
+          ACL protocol.
+
+          If unsure, say N.
+
+config NFS_V4
+        bool "NFS client support for NFS version 4 (EXPERIMENTAL)"
+        depends on NFS_FS && EXPERIMENTAL
+        select RPCSEC_GSS_KRB5
+        help
+          This option enables support for version 4 of the NFS protocol
+          (RFC 3530) in the kernel's NFS client.
+
+          To mount NFS servers using NFSv4, you also need to install user
+          space programs which can be found in the Linux nfs-utils package,
+          available from http://linux-nfs.org/.
+
+          If unsure, say N.
+
+config ROOT_NFS
+        bool "Root file system on NFS"
+        depends on NFS_FS=y && IP_PNP
+        help
+          If you want your system to mount its root file system via NFS,
+          choose Y here.  This is common practice for managing systems
+          without local permanent storage.  For details, read
+          <file:Documentation/filesystems/nfsroot.txt>.
+
+          Most people say N here.
diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
new file mode 100644
index 000000000000..44d7d04dab95
--- /dev/null
+++ b/fs/nfsd/Kconfig
@@ -0,0 +1,80 @@
+config NFSD
+        tristate "NFS server support"
+        depends on INET
+        select LOCKD
+        select SUNRPC
+        select EXPORTFS
+        select NFS_ACL_SUPPORT if NFSD_V2_ACL
+        help
+          Choose Y here if you want to allow other computers to access
+          files residing on this system using Sun's Network File System
+          protocol.  To compile the NFS server support as a module,
+          choose M here: the module will be called nfsd.
+
+          You may choose to use a user-space NFS server instead, in which
+          case you can choose N here.
+
+          To export local file systems using NFS, you also need to install
+          user space programs which can be found in the Linux nfs-utils
+          package, available from http://linux-nfs.org/.  More detail about
+          the Linux NFS server implementation is available via the
+          exports(5) man page.
+
+          Below you can choose which versions of the NFS protocol are
+          available to clients mounting the NFS server on this system.
+          Support for NFS version 2 (RFC 1094) is always available when
+          CONFIG_NFSD is selected.
+
+          If unsure, say N.
+
+config NFSD_V2_ACL
+        bool
+        depends on NFSD
+
+config NFSD_V3
+        bool "NFS server support for NFS version 3"
+        depends on NFSD
+        help
+          This option enables support in your system's NFS server for
+          version 3 of the NFS protocol (RFC 1813).
+
+          If unsure, say Y.
+
+config NFSD_V3_ACL
+        bool "NFS server support for the NFSv3 ACL protocol extension"
+        depends on NFSD_V3
+        select NFSD_V2_ACL
+        help
+          Solaris NFS servers support an auxiliary NFSv3 ACL protocol that
+          never became an official part of the NFS version 3 protocol.
+          This protocol extension allows applications on NFS clients to
+          manipulate POSIX Access Control Lists on files residing on NFS
+          servers.  NFS servers enforce POSIX ACLs on local files whether
+          this protocol is available or not.
+
+          This option enables support in your system's NFS server for the
+          NFSv3 ACL protocol extension allowing NFS clients to manipulate
+          POSIX ACLs on files exported by your system's NFS server.  NFS
+          clients which support the Solaris NFSv3 ACL protocol can then
+          access and modify ACLs on your NFS server.
+
+          To store ACLs on your NFS server, you also need to enable ACL-
+          related CONFIG options for your local file systems of choice.
+
+          If unsure, say N.
+
+config NFSD_V4
+        bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
+        depends on NFSD && PROC_FS && EXPERIMENTAL
+        select NFSD_V3
+        select FS_POSIX_ACL
+        select RPCSEC_GSS_KRB5
+        help
+          This option enables support in your system's NFS server for
+          version 4 of the NFS protocol (RFC 3530).
+
+          To export files using NFSv4, you need to install additional user
+          space programs which can be found in the Linux nfs-utils package,
+          available from http://linux-nfs.org/.
+
+          If unsure, say N.
diff --git a/fs/ntfs/Kconfig b/fs/ntfs/Kconfig
new file mode 100644
index 000000000000..f5a868cc9152
--- /dev/null
+++ b/fs/ntfs/Kconfig
@@ -0,0 +1,78 @@
+config NTFS_FS
+        tristate "NTFS file system support"
+        select NLS
+        help
+          NTFS is the file system of Microsoft Windows NT, 2000, XP and 2003.
+
+          Saying Y or M here enables read support.  There is partial, but
+          safe, write support available.  For write support you must also
+          say Y to "NTFS write support" below.
+
+          There are also a number of user-space tools available, called
+          ntfsprogs.  These include ntfsundelete and ntfsresize, that work
+          without NTFS support enabled in the kernel.
+
+          This is a rewrite from scratch of Linux NTFS support and replaced
+          the old NTFS code starting with Linux 2.5.11.  A backport to
+          the Linux 2.4 kernel series is separately available as a patch
+          from the project web site.
+
+          For more information see <file:Documentation/filesystems/ntfs.txt>
+          and <http://www.linux-ntfs.org/>.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called ntfs.
+
+          If you are not using Windows NT, 2000, XP or 2003 in addition to
+          Linux on your computer it is safe to say N.
+
+config NTFS_DEBUG
+        bool "NTFS debugging support"
+        depends on NTFS_FS
+        help
+          If you are experiencing any problems with the NTFS file system, say
+          Y here.  This will result in additional consistency checks to be
+          performed by the driver as well as additional debugging messages to
+          be written to the system log.  Note that debugging messages are
+          disabled by default.  To enable them, supply the option debug_msgs=1
+          at the kernel command line when booting the kernel or as an option
+          to insmod when loading the ntfs module.  Once the driver is active,
+          you can enable debugging messages by doing (as root):
+          echo 1 > /proc/sys/fs/ntfs-debug
+          Replacing the "1" with "0" would disable debug messages.
+
+          If you leave debugging messages disabled, this results in little
+          overhead, but enabling debug messages results in very significant
+          slowdown of the system.
+
+          When reporting bugs, please try to have available a full dump of
+          debugging messages while the misbehaviour was occurring.
+
+config NTFS_RW
+        bool "NTFS write support"
+        depends on NTFS_FS
+        help
+          This enables the partial, but safe, write support in the NTFS driver.
+
+          The only supported operation is overwriting existing files, without
+          changing the file length.  No file or directory creation, deletion or
+          renaming is possible.  Note only non-resident files can be written to
+          so you may find that some very small files (<500 bytes or so) cannot
+          be written to.
+
+          While we cannot guarantee that it will not damage any data, we have
+          so far not received a single report where the driver would have
+          damaged someones data so we assume it is perfectly safe to use.
+
+          Note:  While write support is safe in this version (a rewrite from
+          scratch of the NTFS support), it should be noted that the old NTFS
+          write support, included in Linux 2.5.10 and before (since 1997),
+          is not safe.
+
+          This is currently useful with TopologiLinux.  TopologiLinux is run
+          on top of any DOS/Microsoft Windows system without partitioning your
+          hard disk.  Unlike other Linux distributions TopologiLinux does not
+          need its own partition.  For more information see
+          <http://topologi-linux.sourceforge.net/>
+
+          It is perfectly safe to say N here.
diff --git a/fs/ocfs2/Kconfig b/fs/ocfs2/Kconfig
new file mode 100644
index 000000000000..701b7a3a872e
--- /dev/null
+++ b/fs/ocfs2/Kconfig
@@ -0,0 +1,85 @@
+config OCFS2_FS
+        tristate "OCFS2 file system support"
+        depends on NET && SYSFS
+        select CONFIGFS_FS
+        select JBD2
+        select CRC32
+        select QUOTA
+        select QUOTA_TREE
+        help
+          OCFS2 is a general purpose extent based shared disk cluster file
+          system with many similarities to ext3. It supports 64 bit inode
+          numbers, and has automatically extending metadata groups which may
+          also make it attractive for non-clustered use.
+
+          You'll want to install the ocfs2-tools package in order to at least
+          get "mount.ocfs2".
+
+          Project web page:    http://oss.oracle.com/projects/ocfs2
+          Tools web page:      http://oss.oracle.com/projects/ocfs2-tools
+          OCFS2 mailing lists: http://oss.oracle.com/projects/ocfs2/mailman/
+
+          For more information on OCFS2, see the file
+          <file:Documentation/filesystems/ocfs2.txt>.
+
+config OCFS2_FS_O2CB
+        tristate "O2CB Kernelspace Clustering"
+        depends on OCFS2_FS
+        default y
+        help
+          OCFS2 includes a simple kernelspace clustering package, the OCFS2
+          Cluster Base.  It only requires a very small userspace component
+          to configure it. This comes with the standard ocfs2-tools package.
+          O2CB is limited to maintaining a cluster for OCFS2 file systems.
+          It cannot manage any other cluster applications.
+
+          It is always safe to say Y here, as the clustering method is
+          run-time selectable.
+
+config OCFS2_FS_USERSPACE_CLUSTER
+        tristate "OCFS2 Userspace Clustering"
+        depends on OCFS2_FS && DLM
+        default y
+        help
+          This option will allow OCFS2 to use userspace clustering services
+          in conjunction with the DLM in fs/dlm.  If you are using a
+          userspace cluster manager, say Y here.
+
+          It is safe to say Y, as the clustering method is run-time
+          selectable.
+
+config OCFS2_FS_STATS
+        bool "OCFS2 statistics"
+        depends on OCFS2_FS
+        default y
+        help
+          This option allows some fs statistics to be captured. Enabling
+          this option may increase the memory consumption.
+
+config OCFS2_DEBUG_MASKLOG
+        bool "OCFS2 logging support"
+        depends on OCFS2_FS
+        default y
+        help
+          The ocfs2 filesystem has an extensive logging system.  The system
+          allows selection of events to log via files in /sys/o2cb/logmask/.
+          This option will enlarge your kernel, but it allows debugging of
+          ocfs2 filesystem issues.
+
+config OCFS2_DEBUG_FS
+        bool "OCFS2 expensive checks"
+        depends on OCFS2_FS
+        default n
+        help
+          This option will enable expensive consistency checks. Enable
+          this option for debugging only as it is likely to decrease
+          performance of the filesystem.
+
+config OCFS2_FS_POSIX_ACL
+        bool "OCFS2 POSIX Access Control Lists"
+        depends on OCFS2_FS
+        select FS_POSIX_ACL
+        default n
+        help
+          Posix Access Control Lists (ACLs) support permissions for users and
+          groups beyond the owner/group/world scheme.
diff --git a/fs/omfs/Kconfig b/fs/omfs/Kconfig
new file mode 100644
index 000000000000..b1b9a0aba6fd
--- /dev/null
+++ b/fs/omfs/Kconfig
@@ -0,0 +1,13 @@
+config OMFS_FS
+        tristate "SonicBlue Optimized MPEG File System support"
+        depends on BLOCK
+        select CRC_ITU_T
+        help
+          This is the proprietary file system used by the Rio Karma music
+          player and ReplayTV DVR.  Despite the name, this filesystem is not
+          more efficient than a standard FS for MPEG files, in fact likely
+          the opposite is true.  Say Y if you have either of these devices
+          and wish to mount its disk.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called omfs.  If unsure, say N.
diff --git a/fs/qnx4/Kconfig b/fs/qnx4/Kconfig
new file mode 100644
index 000000000000..be8e0e1445b6
--- /dev/null
+++ b/fs/qnx4/Kconfig
@@ -0,0 +1,25 @@
+config QNX4FS_FS
+        tristate "QNX4 file system support (read only)"
+        depends on BLOCK
+        help
+          This is the file system used by the real-time operating systems
+          QNX 4 and QNX 6 (the latter is also called QNX RTP).
+          Further information is available at <http://www.qnx.com/>.
+          Say Y if you intend to mount QNX hard disks or floppies.
+          Unless you say Y to "QNX4FS read-write support" below, you will
+          only be able to read these file systems.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called qnx4.
+
+          If you don't know whether you need it, then you don't need it:
+          answer N.
+
+config QNX4FS_RW
+        bool "QNX4FS write support (DANGEROUS)"
+        depends on QNX4FS_FS && EXPERIMENTAL && BROKEN
+        help
+          Say Y if you want to test write support for QNX4 file systems.
+
+          It's currently broken, so for now:
+          answer N.
diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig
new file mode 100644
index 000000000000..949b8c6addc8
--- /dev/null
+++ b/fs/reiserfs/Kconfig
@@ -0,0 +1,85 @@
+config REISERFS_FS
+        tristate "Reiserfs support"
+        help
+          Stores not just filenames but the files themselves in a balanced
+          tree.  Uses journalling.
+
+          Balanced trees are more efficient than traditional file system
+          architectural foundations.
+
+          In general, ReiserFS is as fast as ext2, but is very efficient with
+          large directories and small files.  Additional patches are needed
+          for NFS and quotas, please see <http://www.namesys.com/> for links.
+
+          It is more easily extended to have features currently found in
+          database and keyword search systems than block allocation based file
+          systems are.  The next version will be so extended, and will support
+          plugins consistent with our motto ``It takes more than a license to
+          make source code open.''
+
+          Read <http://www.namesys.com/> to learn more about reiserfs.
+
+          Sponsored by Threshold Networks, Emusic.com, and Bigstorage.com.
+
+          If you like it, you can pay us to add new features to it that you
+          need, buy a support contract, or pay us to port it to another OS.
+
+config REISERFS_CHECK
+        bool "Enable reiserfs debug mode"
+        depends on REISERFS_FS
+        help
+          If you set this to Y, then ReiserFS will perform every check it can
+          possibly imagine of its internal consistency throughout its
+          operation.  It will also go substantially slower.  More than once we
+          have forgotten that this was on, and then gone despondent over the
+          latest benchmarks.:-) Use of this option allows our team to go all
+          out in checking for consistency when debugging without fear of its
+          effect on end users.  If you are on the verge of sending in a bug
+          report, say Y and you might get a useful error message.  Almost
+          everyone should say N.
+
+config REISERFS_PROC_INFO
+        bool "Stats in /proc/fs/reiserfs"
+        depends on REISERFS_FS && PROC_FS
+        help
+          Create under /proc/fs/reiserfs a hierarchy of files, displaying
+          various ReiserFS statistics and internal data at the expense of
+          making your kernel or module slightly larger (+8 KB). This also
+          increases the amount of kernel memory required for each mount.
+          Almost everyone but ReiserFS developers and people fine-tuning
+          reiserfs or tracing problems should say N.
+
+config REISERFS_FS_XATTR
+        bool "ReiserFS extended attributes"
+        depends on REISERFS_FS
+        help
+          Extended attributes are name:value pairs associated with inodes by
+          the kernel or by users (see the attr(5) manual page, or visit
+          <http://acl.bestbits.at/> for details).
+
+          If unsure, say N.
+
+config REISERFS_FS_POSIX_ACL
+        bool "ReiserFS POSIX Access Control Lists"
+        depends on REISERFS_FS_XATTR
+        select FS_POSIX_ACL
+        help
+          Posix Access Control Lists (ACLs) support permissions for users and
+          groups beyond the owner/group/world scheme.
+
+          To learn more about Access Control Lists, visit the Posix ACLs for
+          Linux website <http://acl.bestbits.at/>.
+
+          If you don't know what Access Control Lists are, say N
+
+config REISERFS_FS_SECURITY
+        bool "ReiserFS Security Labels"
+        depends on REISERFS_FS_XATTR
+        help
+          Security labels support alternative access control models
+          implemented by security modules like SELinux.  This option
+          enables an extended attribute handler for file security
+          labels in the ReiserFS filesystem.
+
+          If you are not using a security module that requires using
+          extended attributes for file security labels, say N.
diff --git a/fs/romfs/Kconfig b/fs/romfs/Kconfig
new file mode 100644
index 000000000000..1a17020f9faf
--- /dev/null
+++ b/fs/romfs/Kconfig
@@ -0,0 +1,16 @@
+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.
diff --git a/fs/smbfs/Kconfig b/fs/smbfs/Kconfig
new file mode 100644
index 000000000000..e668127c8b2e
--- /dev/null
+++ b/fs/smbfs/Kconfig
@@ -0,0 +1,55 @@
+config SMB_FS
+        tristate "SMB file system support (OBSOLETE, please use CIFS)"
+        depends on INET
+        select NLS
+        help
+          SMB (Server Message Block) is the protocol Windows for Workgroups
+          (WfW), Windows 95/98, Windows NT and OS/2 Lan Manager use to share
+          files and printers over local networks.  Saying Y here allows you to
+          mount their file systems (often called "shares" in this context) and
+          access them just like any other Unix directory.  Currently, this
+          works only if the Windows machines use TCP/IP as the underlying
+          transport protocol, and not NetBEUI.  For details, read
+          <file:Documentation/filesystems/smbfs.txt> and the SMB-HOWTO,
+          available from <http://www.tldp.org/docs.html#howto>.
+
+          Note: if you just want your box to act as an SMB *server* and make
+          files and printing services available to Windows clients (which need
+          to have a TCP/IP stack), you don't need to say Y here; you can use
+          the program SAMBA (available from <ftp://ftp.samba.org/pub/samba/>)
+          for that.
+
+          General information about how to connect Linux, Windows machines and
+          Macs is on the WWW at <http://www.eats.com/linux_mac_win.html>.
+
+          To compile the SMB support as a module, choose M here:
+          the module will be called smbfs.  Most people say N, however.
+
+config SMB_NLS_DEFAULT
+        bool "Use a default NLS"
+        depends on SMB_FS
+        help
+          Enabling this will make smbfs use nls translations by default. You
+          need to specify the local charset (CONFIG_NLS_DEFAULT) in the nls
+          settings and you need to give the default nls for the SMB server as
+          CONFIG_SMB_NLS_REMOTE.
+
+          The nls settings can be changed at mount time, if your smbmount
+          supports that, using the codepage and iocharset parameters.
+
+          smbmount from samba 2.2.0 or later supports this.
+
+config SMB_NLS_REMOTE
+        string "Default Remote NLS Option"
+        depends on SMB_NLS_DEFAULT
+        default "cp437"
+        help
+          This setting allows you to specify a default value for which
+          codepage the server uses. If this field is left blank no
+          translations will be done by default. The local codepage/charset
+          default to CONFIG_NLS_DEFAULT.
+
+          The nls settings can be changed at mount time, if your smbmount
+          supports that, using the codepage and iocharset parameters.
+
+          smbmount from samba 2.2.0 or later supports this.
diff --git a/fs/squashfs/Kconfig b/fs/squashfs/Kconfig
new file mode 100644
index 000000000000..25a00d19d686
--- /dev/null
+++ b/fs/squashfs/Kconfig
@@ -0,0 +1,51 @@
+config SQUASHFS
+        tristate "SquashFS 4.0 - Squashed file system support"
+        depends on BLOCK
+        select ZLIB_INFLATE
+        help
+          Saying Y here includes support for SquashFS 4.0 (a Compressed
+          Read-Only File System).  Squashfs is a highly compressed read-only
+          filesystem for Linux.  It uses zlib compression to compress both
+          files, inodes and directories.  Inodes in the system are very small
+          and all blocks are packed to minimise data overhead. Block sizes
+          greater than 4K are supported up to a maximum of 1 Mbytes (default
+          block size 128K).  SquashFS 4.0 supports 64 bit filesystems and files
+          (larger than 4GB), full uid/gid information, hard links and
+          timestamps.  
+
+          Squashfs is intended for general read-only filesystem use, for
+          archival use (i.e. in cases where a .tar.gz file may be used), and in
+          embedded systems where low overhead is needed.  Further information
+          and tools are available from http://squashfs.sourceforge.net.
+
+          If you want to compile this as a module ( = code which can be
+          inserted in and removed from the running kernel whenever you want),
+          say M here and read <file:Documentation/modules.txt>.  The module
+          will be called squashfs.  Note that the root file system (the one
+          containing the directory /) cannot be compiled as a module.
+
+          If unsure, say N.
+
+config SQUASHFS_EMBEDDED
+
+        bool "Additional option for memory-constrained systems" 
+        depends on SQUASHFS
+        default n
+        help
+          Saying Y here allows you to specify cache size.
+
+          If unsure, say N.
+
+config SQUASHFS_FRAGMENT_CACHE_SIZE
+        int "Number of fragments cached" if SQUASHFS_EMBEDDED
+        depends on SQUASHFS
+        default "3"
+        help
+          By default SquashFS caches the last 3 fragments read from
+          the filesystem.  Increasing this amount may mean SquashFS
+          has to re-read fragments less often from disk, at the expense
+          of extra system memory.  Decreasing this amount will mean
+          SquashFS uses less memory at the expense of extra reads from disk.
+
+          Note there must be at least one cached fragment.  Anything
+          much more than three will probably not make much difference.
diff --git a/fs/sysfs/Kconfig b/fs/sysfs/Kconfig
new file mode 100644
index 000000000000..f4b67588b9d6
--- /dev/null
+++ b/fs/sysfs/Kconfig
@@ -0,0 +1,23 @@
+config SYSFS
+        bool "sysfs file system support" if EMBEDDED
+        default y
+        help
+        The sysfs filesystem is a virtual filesystem that the kernel uses to
+        export internal kernel objects, their attributes, and their
+        relationships to one another.
+
+        Users can use sysfs to ascertain useful information about the running
+        kernel, such as the devices the kernel has discovered on each bus and
+        which driver each is bound to. sysfs can also be used to tune devices
+        and other kernel subsystems.
+
+        Some system agents rely on the information in sysfs to operate.
+        /sbin/hotplug uses device and object attributes in sysfs to assist in
+        delegating policy decisions, like persistently naming devices.
+
+        sysfs is currently used by the block subsystem to mount the root
+        partition.  If sysfs is disabled you must specify the boot device on
+        the kernel boot command line via its major and minor numbers.  For
+        example, "root=03:01" for /dev/hda1.
+
+        Designers of embedded systems may wish to say N here to conserve space.
diff --git a/fs/sysv/Kconfig b/fs/sysv/Kconfig
new file mode 100644
index 000000000000..33aeb4b75db1
--- /dev/null
+++ b/fs/sysv/Kconfig
@@ -0,0 +1,36 @@
+config SYSV_FS
+        tristate "System V/Xenix/V7/Coherent file system support"
+        depends on BLOCK
+        help
+          SCO, Xenix and Coherent are commercial Unix systems for Intel
+          machines, and Version 7 was used on the DEC PDP-11. Saying Y
+          here would allow you to read from their floppies and hard disk
+          partitions.
+
+          If you have floppies or hard disk partitions like that, it is likely
+          that they contain binaries from those other Unix systems; in order
+          to run these binaries, you will want to install linux-abi which is
+          a set of kernel modules that lets you run SCO, Xenix, Wyse,
+          UnixWare, Dell Unix and System V programs under Linux.  It is
+          available via FTP (user: ftp) from
+          <ftp://ftp.openlinux.org/pub/people/hch/linux-abi/>).
+          NOTE: that will work only for binaries from Intel-based systems;
+          PDP ones will have to wait until somebody ports Linux to -11 ;-)
+
+          If you only intend to mount files from some other Unix over the
+          network using NFS, you don't need the System V file system support
+          (but you need NFS file system support obviously).
+
+          Note that this option is generally not needed for floppies, since a
+          good portable way to transport files and directories between unixes
+          (and even other operating systems) is given by the tar program ("man
+          tar" or preferably "info tar").  Note also that this option has
+          nothing whatsoever to do with the option "System V IPC". Read about
+          the System V file system in
+          <file:Documentation/filesystems/sysv-fs.txt>.
+          Saying Y here will enlarge your kernel by about 27 KB.
+
+          To compile this as a module, choose M here: the module will be called
+          sysv.
+
+          If you haven't heard about all of this before, it's safe to say N.
diff --git a/fs/udf/Kconfig b/fs/udf/Kconfig
new file mode 100644
index 000000000000..0e0e99bd6bce
--- /dev/null
+++ b/fs/udf/Kconfig
@@ -0,0 +1,18 @@
+config UDF_FS
+        tristate "UDF file system support"
+        select CRC_ITU_T
+        help
+          This is the new file system used on some CD-ROMs and DVDs. Say Y if
+          you intend to mount DVD discs or CDRW's written in packet mode, or
+          if written to by other UDF utilities, such as DirectCD.
+          Please read <file:Documentation/filesystems/udf.txt>.
+
+          To compile this file system support as a module, choose M here: the
+          module will be called udf.
+
+          If unsure, say N.
+
+config UDF_NLS
+        bool
+        default y
+        depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y)
diff --git a/fs/ufs/Kconfig b/fs/ufs/Kconfig
new file mode 100644
index 000000000000..e4f10a40768a
--- /dev/null
+++ b/fs/ufs/Kconfig
@@ -0,0 +1,43 @@
+config UFS_FS
+        tristate "UFS file system support (read only)"
+        depends on BLOCK
+        help
+          BSD and derivate versions of Unix (such as SunOS, FreeBSD, NetBSD,
+          OpenBSD and NeXTstep) use a file system called UFS. Some System V
+          Unixes can create and mount hard disk partitions and diskettes using
+          this file system as well. Saying Y here will allow you to read from
+          these partitions; if you also want to write to them, say Y to the
+          experimental "UFS file system write support", below. Please read the
+          file <file:Documentation/filesystems/ufs.txt> for more information.
+
+          The recently released UFS2 variant (used in FreeBSD 5.x) is
+          READ-ONLY supported.
+
+          Note that this option is generally not needed for floppies, since a
+          good portable way to transport files and directories between unixes
+          (and even other operating systems) is given by the tar program ("man
+          tar" or preferably "info tar").
+
+          When accessing NeXTstep files, you may need to convert them from the
+          NeXT character set to the Latin1 character set; use the program
+          recode ("info recode") for this purpose.
+
+          To compile the UFS file system support as a module, choose M here: the
+          module will be called ufs.
+
+          If you haven't heard about all of this before, it's safe to say N.
+
+config UFS_FS_WRITE
+        bool "UFS file system write support (DANGEROUS)"
+        depends on UFS_FS && EXPERIMENTAL
+        help
+          Say Y here if you want to try writing to UFS partitions. This is
+          experimental, so you should back up your UFS partitions beforehand.
+
+config UFS_DEBUG
+        bool "UFS debugging"
+        depends on UFS_FS
+        help
+          If you are experiencing any problems with the UFS filesystem, say
+          Y here.  This will result in _many_ additional debugging messages to be
+          written to the system log.
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
new file mode 100644
index 000000000000..eda4a7aee596
--- /dev/null
+++ b/net/sunrpc/Kconfig
@@ -0,0 +1,79 @@
+config SUNRPC
+        tristate
+
+config SUNRPC_GSS
+        tristate
+
+config SUNRPC_XPRT_RDMA
+        tristate
+        depends on SUNRPC && INFINIBAND && EXPERIMENTAL
+        default SUNRPC && INFINIBAND
+        help
+          This option enables an RPC client transport capability that
+          allows the NFS client to mount servers via an RDMA-enabled
+          transport.
+
+          To compile RPC client RDMA transport support as a module,
+          choose M here: the module will be called xprtrdma.
+
+          If unsure, say N.
+
+config SUNRPC_REGISTER_V4
+        bool "Register local RPC services via rpcbind v4 (EXPERIMENTAL)"
+        depends on SUNRPC && EXPERIMENTAL
+        default n
+        help
+          Sun added support for registering RPC services at an IPv6
+          address by creating two new versions of the rpcbind protocol
+          (RFC 1833).
+
+          This option enables support in the kernel RPC server for
+          registering kernel RPC services via version 4 of the rpcbind
+          protocol.  If you enable this option, you must run a portmapper
+          daemon that supports rpcbind protocol version 4.
+
+          Serving NFS over IPv6 from knfsd (the kernel's NFS server)
+          requires that you enable this option and use a portmapper that
+          supports rpcbind version 4.
+
+          If unsure, say N to get traditional behavior (register kernel
+          RPC services using only rpcbind version 2).  Distributions
+          using the legacy Linux portmapper daemon must say N here.
+
+config RPCSEC_GSS_KRB5
+        tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
+        depends on SUNRPC && EXPERIMENTAL
+        select SUNRPC_GSS
+        select CRYPTO
+        select CRYPTO_MD5
+        select CRYPTO_DES
+        select CRYPTO_CBC
+        help
+          Choose Y here to enable Secure RPC using the Kerberos version 5
+          GSS-API mechanism (RFC 1964).
+
+          Secure RPC calls with Kerberos require an auxiliary user-space
+          daemon which may be found in the Linux nfs-utils package
+          available from http://linux-nfs.org/.  In addition, user-space
+          Kerberos support should be installed.
+
+          If unsure, say N.
+
+config RPCSEC_GSS_SPKM3
+        tristate "Secure RPC: SPKM3 mechanism (EXPERIMENTAL)"
+        depends on SUNRPC && EXPERIMENTAL
+        select SUNRPC_GSS
+        select CRYPTO
+        select CRYPTO_MD5
+        select CRYPTO_DES
+        select CRYPTO_CAST5
+        select CRYPTO_CBC
+        help
+          Choose Y here to enable Secure RPC using the SPKM3 public key
+          GSS-API mechansim (RFC 2025).
+
+          Secure RPC calls with SPKM3 require an auxiliary userspace
+          daemon which may be found in the Linux nfs-utils package
+          available from http://linux-nfs.org/.
+
+          If unsure, say N.