From b019c5dab1abf016294db527c5aaac7968a1def5 Mon Sep 17 00:00:00 2001
From: Mi Jinlong <mijinlong@cn.fujitsu.com>
Date: Sat, 30 Oct 2010 10:19:33 +0800
Subject: [PATCH] --- yaml --- r: 223052 b: refs/heads/master c:
 0de1b7e800188782973598158e0acbb9e08e6c99 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dc5956c83753..3c360244c9e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21ac19d484a8ffb66f64487846c8d53afef04d2b
+refs/heads/master: 0de1b7e800188782973598158e0acbb9e08e6c99
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 3c045044fca2..4100630c9a5b 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1069,12 +1069,10 @@ static int nfs_parse_mount_options(char *raw,
 			mnt->flags |= NFS_MOUNT_VER3;
 			mnt->version = 3;
 			break;
-#ifdef CONFIG_NFS_V4
 		case Opt_v4:
 			mnt->flags &= ~NFS_MOUNT_VER3;
 			mnt->version = 4;
 			break;
-#endif
 		case Opt_udp:
 			mnt->flags &= ~NFS_MOUNT_TCP;
 			mnt->nfs_server.protocol = XPRT_TRANSPORT_UDP;
@@ -1286,12 +1284,10 @@ static int nfs_parse_mount_options(char *raw,
 				mnt->flags |= NFS_MOUNT_VER3;
 				mnt->version = 3;
 				break;
-#ifdef CONFIG_NFS_V4
 			case NFS4_VERSION:
 				mnt->flags &= ~NFS_MOUNT_VER3;
 				mnt->version = 4;
 				break;
-#endif
 			default:
 				goto out_invalid_value;
 			}