projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[cascardo/linux.git]
/
fs
/
nfs
/
Kconfig
diff --git
a/fs/nfs/Kconfig
b/fs/nfs/Kconfig
index
3dece03
..
c7abc10
100644
(file)
--- a/
fs/nfs/Kconfig
+++ b/
fs/nfs/Kconfig
@@
-128,6
+128,11
@@
config PNFS_OBJLAYOUT
depends on NFS_V4_1 && SCSI_OSD_ULD
default NFS_V4
+config PNFS_FLEXFILE_LAYOUT
+ tristate
+ depends on NFS_V4_1 && NFS_V3
+ default m
+
config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN
string "NFSv4.1 Implementation ID Domain"
depends on NFS_V4_1