Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / fs / Kconfig

diff --git a/fs/Kconfig b/fs/Kconfig
index ac474a61be37951a4484522eaa2ae0377d8d02b2..3e6d3101f3ff0dba9d2995b8950e8629e67677a7 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -8,6 +8,13 @@ menu "File systems"
 config DCACHE_WORD_ACCESS
        bool
 
+config VALIDATE_FS_PARSER
+       bool "Validate filesystem parameter description"
+       default y
+       help
+         Enable this to perform validation of the parameter description for a
+         filesystem when it is registered.
+
 if BLOCK
 
 config FS_IOMAP
@@ -254,12 +261,9 @@ source "fs/romfs/Kconfig"
 source "fs/pstore/Kconfig"
 source "fs/sysv/Kconfig"
 source "fs/ufs/Kconfig"
-source "fs/exofs/Kconfig"
 
 endif # MISC_FILESYSTEMS
 
-source "fs/exofs/Kconfig.ore"
-
 menuconfig NETWORK_FILESYSTEMS
        bool "Network File Systems"
        default y