aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2015-10-21 11:11:37 +0800
committerKevin Hilman <khilman@linaro.org>2015-11-11 16:07:56 -0800
commiteb87fd05d43e59d65457ce3436fb8c67f2520344 (patch)
tree73e25a10c7bc04ae70175337f34f05319ef3841c
parente0ddb0d39bf8e71cf36aa3a0e1b7e94c33a1f22b (diff)
downloadlinux-linaro-stable-v3.14/topic/configs.tar.gz
linaro-base.conf: remove CONFIG_NFS_V2 is not setv3.14/topic/configs
Upstream defconfigs set CONFIG_NFS_V2=y, which is needed to test kernel with NFSroot. However when we merge the linaro-base.conf, it disables CONFIG_NFS_V2, which caused NFS mount failure. Since NFS_V2 is enabled by default in the upstream defconfigs, removing line "CONFIG_NFS_V2 is not set" will keep it enabled and fix the problem. Signed-off-by: Chase Qi <chase.qi@linaro.org> Acked-by: Kevin Hilman <khilman@linaro.org> (cherry picked from commit 5369b8553259a7acfcb1aac4819e06e8524a9581) [khilman: picked from v4.1 configs tree, branch: configs-core-tracking] Signed-off-by: Kevin Hilman <khilman@linaro.org>
-rw-r--r--linaro/configs/linaro-base.conf1
1 files changed, 0 insertions, 1 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf
index 0a1d7bc..e9a7631 100644
--- a/linaro/configs/linaro-base.conf
+++ b/linaro/configs/linaro-base.conf
@@ -70,7 +70,6 @@ CONFIG_JFFS2_RUBIN=y
CONFIG_CRAMFS=y
CONFIG_NETWORK_FILESYSTEMS=y
CONFIG_NFS_FS=y
-# CONFIG_NFS_V2 is not set
CONFIG_NFS_V3=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y