]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
config: android-base: add CONFIG_IKCONFIG option
authorGreg Kroah-Hartman <gregkh@google.com>
Thu, 8 Jun 2017 12:39:13 +0000 (18:09 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Jun 2017 09:47:38 +0000 (11:47 +0200)
This adds CONFIG_IKCONFIG and CONFIG_IKCONFIG_PROC options, which are a
requirement for the O release.

Reviewed-at: https://android-review.googlesource.com/#/c/364553/

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
[AmitP: cherry-picked this change from Android common kernel]
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/configs/android-base.config

index efe5ff86767e98b3c56530689f7693df224b70bc..e12cfec257580daedd5d63768e4fc917b6b5c603 100644 (file)
@@ -25,6 +25,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