From: Borislav Petkov <bp@suse.de>
Date: Sat, 10 Sep 2016 10:34:31 +0000 (+1000)
Subject: config/android: Remove CONFIG_IPV6_PRIVACY
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9ac62c67dfa864c589ad9731ee2e0b1d15b6c559;p=deliverable%2Flinux.git

config/android: Remove CONFIG_IPV6_PRIVACY

Option is long gone, see

  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>
---

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