Merge branch 'linus' into perf/urgent

[pandora-kernel.git] / fs / nfsd / Kconfig

diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
index fbb2a5e..10e6366 100644 (file)
--- a/fs/nfsd/Kconfig
+++ b/fs/nfsd/Kconfig
@@ -28,18 +28,6 @@ config NFSD
 
          If unsure, say N.
 
-config NFSD_DEPRECATED
-       bool "Include support for deprecated syscall interface to NFSD"
-       depends on NFSD
-       default y
-       help
-         The syscall interface to nfsd was obsoleted in 2.6.0 by a new
-         filesystem based interface.  The old interface is due for removal
-         in 2.6.40.  If you wish to remove the interface before then
-         say N.
-
-         In unsure, say Y.
-
 config NFSD_V2_ACL
        bool
        depends on NFSD