diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 00:44:43 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 00:44:43 -0800 |
| commit | f36768e3d16bbd093bd154d7feebfa379f107503 (patch) | |
| tree | 37ebafb252a4d5dee2b78b0f5299c39a779181eb | |
| parent | 421c7867d103022407e0db0a1409441dc772d55c (diff) | |
| parent | d9db5fe079f4b5f9407dddd591ebe70b967a21fd (diff) | |
Merge "defconfig: Enable config INET_DIAG_DESTROY"
| -rw-r--r-- | arch/arm/configs/msmfalcon-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/msmfalcon_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/msmfalcon-perf_defconfig b/arch/arm/configs/msmfalcon-perf_defconfig index 5bb27a820fd9..831c5b780a89 100644 --- a/arch/arm/configs/msmfalcon-perf_defconfig +++ b/arch/arm/configs/msmfalcon-perf_defconfig @@ -94,6 +94,7 @@ CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y # CONFIG_INET_LRO is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y diff --git a/arch/arm/configs/msmfalcon_defconfig b/arch/arm/configs/msmfalcon_defconfig index 7713caa9514b..a4c5026d6ed6 100644 --- a/arch/arm/configs/msmfalcon_defconfig +++ b/arch/arm/configs/msmfalcon_defconfig @@ -93,6 +93,7 @@ CONFIG_INET_AH=y CONFIG_INET_ESP=y CONFIG_INET_IPCOMP=y # CONFIG_INET_LRO is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IPV6_OPTIMISTIC_DAD=y |