diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2017-06-08 18:09:13 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-09 11:47:38 +0200 |
| commit | 5b89db2fa545b473dc352689ac3afe407367ea34 (patch) | |
| tree | 5dac8cad9d88b1cac4c27ef5ce5bc36e7a3d2dc1 /kernel/configs | |
| parent | fb0b1538983c1cf7d2a2242b332a34a953753624 (diff) | |
| download | talos-obmc-linux-5b89db2fa545b473dc352689ac3afe407367ea34.tar.gz talos-obmc-linux-5b89db2fa545b473dc352689ac3afe407367ea34.zip | |
config: android-base: add CONFIG_IKCONFIG option
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>
Diffstat (limited to 'kernel/configs')
| -rw-r--r-- | kernel/configs/android-base.config | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index efe5ff86767e..e12cfec25758 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -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 |
