diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-11-11 16:08:36 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-11-11 16:08:36 -0800 |
| commit | 1388239cd22fcaf1572a12197faa14a63d45aa27 (patch) | |
| tree | f537885d8357f56138dcd6d06892c2087ef212ff | |
| parent | 1ea3a378f2cc7c3b3b4f3285921445506d92c429 (diff) | |
| parent | eb87fd05d43e59d65457ce3436fb8c67f2520344 (diff) | |
Merge branch 'v3.14/topic/configs' into linux-linaro-lsk-v3.14lsk-v3.14-15.11
* v3.14/topic/configs:
linaro-base.conf: remove CONFIG_NFS_V2 is not set
| -rw-r--r-- | linaro/configs/linaro-base.conf | 1 |
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 |