From 1e8bf133656f76a8a514a2efc9b4c49cec51dd09 Mon Sep 17 00:00:00 2001
From: Boaz Harrosh <bharrosh@panasas.com>
Date: Thu, 11 Aug 2011 14:29:25 -0700
Subject: [PATCH] --- yaml --- r: 262760 b: refs/heads/master c:
 8cf1fb21632d302fad6404f891b002ab8c13b1b4 h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/Kconfig | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index c7c3a76f5310..d28a3ace7180 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c20871998c082f6fbc963f1449a5ba5140ee39a
+refs/heads/master: 8cf1fb21632d302fad6404f891b002ab8c13b1b4
diff --git a/trunk/fs/nfs/Kconfig b/trunk/fs/nfs/Kconfig
index 0d306131706d..dbcd82126aed 100644
--- a/trunk/fs/nfs/Kconfig
+++ b/trunk/fs/nfs/Kconfig
@@ -89,24 +89,14 @@ config PNFS_FILE_LAYOUT
 	tristate
 
 config PNFS_BLOCK
-	tristate "Provide support for the pNFS Block Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"
+	tristate
 	depends on NFS_FS && NFS_V4_1 && BLK_DEV_DM
-	help
-	  Say M here if you want your pNFS client to support the Block Layout Driver
-	  (RFC 5663). Requires Multiple devices driver support (DM) and Device mapper
-	  support (BLK_DEV_DM).
-
-	  If unsure, say N.
+	default m
 
 config PNFS_OBJLAYOUT
-	tristate "Provide support for the pNFS Objects Layout Driver for NFSv4.1 pNFS (EXPERIMENTAL)"
+	tristate
 	depends on NFS_FS && NFS_V4_1 && SCSI_OSD_ULD
-	help
-	  Say M here if you want your pNFS client to support the Objects Layout Driver.
-	  Requires the SCSI osd initiator library (SCSI_OSD_INITIATOR) and
-	  upper level driver (SCSI_OSD_ULD).
-
-	  If unsure, say N.
+	default m
 
 config ROOT_NFS
 	bool "Root file system on NFS"