git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 'staging-next' to Linus's tree
[pandora-kernel.git]
/
fs
/
Kconfig
diff --git
a/fs/Kconfig
b/fs/Kconfig
index
25ce2dc
..
771f457
100644
(file)
--- a/
fs/Kconfig
+++ b/
fs/Kconfig
@@
-47,6
+47,9
@@
source "fs/nilfs2/Kconfig"
endif # BLOCK
+config EXPORTFS
+ tristate
+
config FILE_LOCKING
bool "Enable POSIX file locking API" if EMBEDDED
default y
@@
-220,9
+223,6
@@
config LOCKD_V4
depends on FILE_LOCKING
default y
-config EXPORTFS
- tristate
-
config NFS_ACL_SUPPORT
tristate
select FS_POSIX_ACL