From 2de9a6220ec5ba4334d28929b50666e1cfa0fa62 Mon Sep 17 00:00:00 2001 From: Chase Qi Date: Wed, 21 Oct 2015 11:11:37 +0800 Subject: linaro-base.conf: remove CONFIG_NFS_V2 is not set 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 Acked-by: Kevin Hilman (cherry picked from commit 5369b8553259a7acfcb1aac4819e06e8524a9581) [khilman: picked from v4.1 configs tree, branch: configs-core-tracking] Signed-off-by: Kevin Hilman --- linaro/configs/linaro-base.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index 0a1d7bcd63ad..e9a76314a2a8 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 -- cgit v1.2.3