diff options
author | Robert Richter <robert.richter@amd.com> | 2010-10-01 08:54:17 +0200 |
---|---|---|
committer | Robert Richter <robert.richter@amd.com> | 2010-10-01 08:54:17 +0200 |
commit | ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66 (patch) | |
tree | b801ba4d7ebb1155df68d530df49444ffa6252cc /fs/nfs/Kconfig | |
parent | 4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb (diff) | |
parent | 98d943b02f6f1b57787ff1aa6f34d019a407e3ee (diff) | |
download | op-kernel-dev-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.zip op-kernel-dev-ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66.tar.gz |
Merge branch 'oprofile/urgent' into oprofile/core
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'fs/nfs/Kconfig')
-rw-r--r-- | fs/nfs/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 6c2aad4..f7e13db 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -63,6 +63,7 @@ config NFS_V3_ACL config NFS_V4 bool "NFS client support for NFS version 4" depends on NFS_FS + select SUNRPC_GSS help This option enables support for version 4 of the NFS protocol (RFC 3530) in the kernel's NFS client. |