diff options
author | Borislav Petkov <bp@suse.de> | 2016-10-11 13:54:36 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2017-04-01 18:46:04 +0200 |
commit | b6cf5c77e06e10cb93e768f96893007cf54a77ae (patch) | |
tree | faf382252977e0221c25247fab5d27058e4f42ba /android | |
parent | 312b1f89aadbca0cc46f4cabad16f6b00f27c402 (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 'android')
-rw-r--r-- | android/configs/android-base.cfg | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index 3672bf339006..1ff32af855c3 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -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 |