aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-11-11 16:11:02 -0800
committerKevin Hilman <khilman@linaro.org>2015-11-11 16:11:02 -0800
commitde862fe2cd3432b1d1acb0b570a33dbdd02bf4a1 (patch)
tree37c53c2bd7751704897f895693c78773bcce4e58
parent4a1f99f55c4c78fd11a92dc83d9a6fa2a40d2215 (diff)
parentaeeb135a11f494e52c1836716f5a5869a314d571 (diff)
Merge branch 'v3.10/topic/configs' into linux-linaro-lsk-v3.10lsk-v3.10-15.11
* v3.10/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 c86f432f818a..8702e0de0aa4 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