aboutsummaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-10-11 13:54:36 -0700
committerMister Oyster <oysterized@gmail.com>2017-04-13 12:35:11 +0200
commita33e909626307e892f745d5202ab3877c70a7809 (patch)
tree9c1a34976afeeaabb0eaa66bdb6d8cc356ef1f2b /android
parent3a0022ecd51f4ac59096632b7728979e321f4941 (diff)
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.cfg1
1 files changed, 0 insertions, 1 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index 0fd8582c0..d36a38b73 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -36,7 +36,6 @@ CONFIG_IP6_NF_TARGET_REJECT=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