diff --git a/[refs] b/[refs]
index 8a372936ec73..68e9b79e89a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3072b90c4726396e38160cc1f7c93191e2f4a566
+refs/heads/master: bb1e5f8c022ae2f6bf1ec0c6b861db3c35976377
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 65781de44fc0..b5e582bd769d 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/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
@@ -222,9 +225,6 @@ config LOCKD_V4
 	depends on FILE_LOCKING
 	default y
 
-config EXPORTFS
-	tristate
-
 config NFS_ACL_SUPPORT
 	tristate
 	select FS_POSIX_ACL