Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[karo-tx-linux.git] / fs / nfs / Kconfig

diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
index a048928340a7e188dbc67c9251cac9b16207baec..b5e80b0af315b065954fe42c2a832e85ff57b23f 100644 (file)
--- a/fs/nfs/Kconfig
+++ b/fs/nfs/Kconfig
@@ -140,6 +140,11 @@ config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
          If the NFS client is unchanged from the upstream kernel, this
          option should be set to the default "kernel.org".
 
+config NFS_V4_SECURITY_LABEL
+       bool
+       depends on NFS_V4_2 && SECURITY
+       default y
+
 config ROOT_NFS
        bool "Root file system on NFS"
        depends on NFS_FS=y && IP_PNP