diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-22 13:30:49 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-22 13:30:49 -0700 |
| commit | 53c3c13396c2a8ee4fd9e83141b3e2b22223e590 (patch) | |
| tree | f5fd6c4f5cd182aac79574f8cf5dff242e5cd9a8 | |
| parent | ddd01b0ef48b77802feccfad1ca0604d525f85c0 (diff) | |
| parent | 46ffd20160221b3a3efe4511d17a4c22765ca775 (diff) | |
Merge branch 'v4.1/topic/configs' into linux-linaro-lsk-v4.1lsk-v4.1-15.10
* v4.1/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 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 |