diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-08 12:01:27 -0600 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-08 12:01:27 -0600 |
commit | 5765ecb5ef2401f7bd0feaeeadbe6dbc558b9791 (patch) | |
tree | d6e81f7e3954c2a3a5270fa5ef49e8b5f30d3bfd /linaro/configs/linaro-base.conf | |
parent | 5caca6fd8ad5ad90307a1d3519b160a6eb347c4b (diff) | |
parent | c40244a82c45d0e40f79b5aab1eebc120e666037 (diff) |
Merge branch 'lng-core-configs' into linux-lnglinux-lng-v3.10.17-final
Diffstat (limited to 'linaro/configs/linaro-base.conf')
-rw-r--r-- | linaro/configs/linaro-base.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index 947ca1f50935..44438e22c466 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -6,7 +6,6 @@ CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_BLK_DEV_INITRD=y CONFIG_EMBEDDED=y -CONFIG_HOTPLUG=y CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_PROFILING=y @@ -70,7 +69,7 @@ CONFIG_JFFS2_RUBIN=y CONFIG_CRAMFS=y CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=y -# CONFIG_NFS_V2 is not set +CONFIG_NFS_V2=y CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y |