From 9126a1e2761db9aeea2147f35104351a16d6759b Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Tue, 26 Oct 2010 14:22:32 -0700
Subject: [PATCH] --- yaml --- r: 217521 b: refs/heads/master c:
 4199ca77cc44c418972e8f30a36be7d26d21a0d2 h: refs/heads/master i:   217519:
 6c87c87c9ee12bd9118307c45a7c8b53e9d59317 v: v3

---
 [refs]           | 2 +-
 trunk/fs/Kconfig | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b978dda08c9e..adeb003eb3e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1df79da85657aecde2ecff052ff0cf9910311078
+refs/heads/master: 4199ca77cc44c418972e8f30a36be7d26d21a0d2
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