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:10:28 -0800
commitaeeb135a11f494e52c1836716f5a5869a314d571 (patch)
treeaea5e09f1ebc4bfc6632210ab786e574647a6828
parent0532c0990157877779fb61c8f5365af967913479 (diff)
downloadlinux-linaro-stable-v3.10/topic/configs.tar.gz
linaro-base.conf: remove CONFIG_NFS_V2 is not setv3.10/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 77f8851..2e18eb1 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