aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-10-22 13:44:12 -0700
committerKevin Hilman <khilman@linaro.org>2015-10-22 13:44:12 -0700
commitc1fa16368f309a6f636ad193a47cde9253db97a7 (patch)
treeb7ce80976c6d4d8075ee66abf482eee1e3878a94
parent2b090d9432eb704e3d718a0a05a3d62437b1863f (diff)
parent2de9a6220ec5ba4334d28929b50666e1cfa0fa62 (diff)
downloadlinux-linaro-stable-c1fa16368f309a6f636ad193a47cde9253db97a7.tar.gz
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18lsk-v3.18-15.10
* v3.18/topic/configs: linaro-base.conf: remove CONFIG_NFS_V2 is not set
-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 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