summaryrefslogtreecommitdiff
path: root/android/configs
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-10-11 13:54:36 -0700
committerAmit Pundir <amit.pundir@linaro.org>2017-04-10 13:27:39 +0530
commitf91f25c224eead4166bbe96835ab04f13458585d (patch)
treef9b6e5e58caa4d1da8b4f8b85999b492fe4c6993 /android/configs
parent9a714c9661a0509c00847b4aaf5d96144e66dbc8 (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/configs')
-rw-r--r--android/configs/android-base.cfg1
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