commit 286cc3d714d75c37821469f233083c014d5fc98f
author Greg Kroah-Hartman <gregkh@google.com> Tue Apr 04 19:45:38 2017 +0200
committer Greg Kroah-Hartman <gregkh@google.com> Tue Apr 04 19:58:52 2017 +0200
tree 85053685b13a059ec2168434615992d573c568d3
parent b27c43ca7a206ba0f110a0eddc3eb1e1c504e9b1

ANDROID: android-base.cfg: add CONFIG_IKCONFIG option

This adds CONFIG_IKCONFIG and CONFIG_IKCONFIG_PROC options, which are a
requirement for the O release.

Bug: 35803310
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
(cherry picked from commit 7d9280f579ff0731facb1e10f32e4a88a07f33f8)

kernel/configs/android-base.config

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index a1969d0..7d4ce82 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -26,6 +26,8 @@
 CONFIG_FB=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_INET6_AH=y
 CONFIG_INET6_ESP=y
 CONFIG_INET6_IPCOMP=y