From: Greg Kroah-Hartman <gregkh@google.com>
Date: Tue, 4 Apr 2017 17:45:38 +0000 (+0200)
Subject: ANDROID: android-base.cfg: add CONFIG_IKCONFIG option
X-Git-Tag: release-20171130_firefly~4^2~100^2~161
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6286b142aeb28bd7c7a7cd4679f694686e5af6ee;p=firefly-linux-kernel-4.4.55.git

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

diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index a1969d0d7926..7d4ce82f5b8e 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -26,6 +26,8 @@ CONFIG_EMBEDDED=y
 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