diff options
| author | Borislav Petkov <bp@suse.de> | 2016-10-11 13:54:36 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-03-05 21:56:13 +0530 |
| commit | acef484554a59e416440e2976a44c338a04ffe55 (patch) | |
| tree | 36647c5036fc7545245a9831f9d7a4aade5e7aff /kernel | |
| parent | bbf3d8ad4f65fd74eaf4711a56598d1d887e6ff9 (diff) | |
UPSTREAM: config/android: Remove CONFIG_IPV6_PRIVACY
Option is long gone, see commit 5d9efa7ee99e ("ipv6: Remove privacy
config option.")
Link: http://lkml.kernel.org/r/20160811170340.9859-1-bp@alien8.de
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Rob Herring <robh@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit a2c6a235dbf4318fc7f7981932478e6c47f093ab)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/configs/android-base.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index 9f748ed7bea8..fcf2de834ee9 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -41,7 +41,6 @@ CONFIG_IPV6=y CONFIG_IPV6_MIP6=y CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_OPTIMISTIC_DAD=y -CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y CONFIG_IP_ADVANCED_ROUTER=y |