summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-10-11 13:54:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-10-11 15:06:32 -0700
commita2c6a235dbf4318fc7f7981932478e6c47f093ab (patch)
tree183153efa01f518b1b29c2d7c123a7b28fb4c302
parent26b5679e437ef4f83db66437981c7c0d569973b1 (diff)
downloadlinux-a2c6a235dbf4318fc7f7981932478e6c47f093ab.tar.bz2
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>
-rw-r--r--kernel/configs/android-base.config1
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