diff --git a/[refs] b/[refs] index fcca80d815fa..4841e1befff9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f1fafee9e42b73beb3aa51ab2d6a19bfddeb5fe +refs/heads/master: 79fead47c51b874a26cf5865408a5b784b52a929 diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig index f3aa9b08b228..efb7d4ec6fcf 100644 --- a/trunk/fs/Kconfig +++ b/trunk/fs/Kconfig @@ -47,7 +47,7 @@ config FS_POSIX_ACL def_bool n config EXPORTFS - bool + tristate config FILE_LOCKING bool "Enable POSIX file locking API" if EXPERT