diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-06-11 22:53:24 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-06-11 22:53:24 +0300 |
| commit | 9e93f91de900feae2b05c4725522fcefc2229eff (patch) | |
| tree | 0d47cbfbcda69a7732db9cb65d6cabc6b310c04b | |
| parent | 3b2ab998a6c0153198808fd6d489b98576329607 (diff) | |
| parent | fff72b9e00ff51bbda2ef8aec1e975a49c7800d2 (diff) | |
Merge branch 'config-core-4.1' into config-tracking
| -rw-r--r-- | linaro/configs/linaro-base.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linaro/configs/linaro-base.conf b/linaro/configs/linaro-base.conf index 02eace74bcb..15682abc4c0 100644 --- a/linaro/configs/linaro-base.conf +++ b/linaro/configs/linaro-base.conf @@ -94,8 +94,6 @@ CONFIG_FUNCTION_TRACER=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_PROC_DEVICETREE=y CONFIG_AUDIT=y -CONFIG_NET=y -CONFIG_INET=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y |