summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2017-04-04 19:45:38 +0200
committerAmit Pundir <amit.pundir@linaro.org>2017-04-10 13:28:40 +0530
commit6286b142aeb28bd7c7a7cd4679f694686e5af6ee (patch)
treec197230a6e7c7a74dcb8ca632172771d3ab33066 /android
parent9b4449a65cb89cd27805b8a2b0dce0cc3016a76d (diff)
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)
Diffstat (limited to 'android')
-rw-r--r--android/configs/android-base.cfg2
1 files changed, 2 insertions, 0 deletions
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