aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-10-22 13:27:43 -0700
committerKevin Hilman <khilman@linaro.org>2015-10-22 13:27:43 -0700
commit46ffd20160221b3a3efe4511d17a4c22765ca775 (patch)
treeb1a96c57f3ef545b2891cf256cfa07777dee779a
parentc418dc1dbd48e227e0c325ce89f9181dea2826ce (diff)
parent5342b52247d50adfd3bb16c1c4ba03db5f2d05c2 (diff)
Merge remote-tracking branch 'configs/config-tracking' into v4.1/topic/configs
* configs/config-tracking: 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 15682abc4c00..1988c42cedea 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