Merge tag 'md/4.1' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / fs / nfsd / Kconfig

diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index 683bf718aead54f072ea974c57195bf5fd60dead..a0b77fc1bd3944e9f966705518d4138cd2e4f0e3 100644 (file)
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -6,6 +6,7 @@ config NFSD
        select SUNRPC
        select EXPORTFS
        select NFS_ACL_SUPPORT if NFSD_V2_ACL
+       depends on MULTIUSER
        help
          Choose Y here if you want to allow other computers to access
          files residing on this system using Sun's Network File System
@@ -107,7 +108,7 @@ config NFSD_V4_SECURITY_LABEL
 
 config NFSD_FAULT_INJECTION
        bool "NFS server manual fault injection"
-       depends on NFSD_V4 && DEBUG_KERNEL
+       depends on NFSD_V4 && DEBUG_KERNEL && DEBUG_FS
        help
          This option enables support for manually injecting faults
          into the NFS server.  This is intended to be used for