Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751689AbdFHMjz (ORCPT ); Thu, 8 Jun 2017 08:39:55 -0400 Received: from mail-pg0-f54.google.com ([74.125.83.54]:34037 "EHLO mail-pg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751620AbdFHMjt (ORCPT ); Thu, 8 Jun 2017 08:39:49 -0400 From: Amit Pundir To: Andrew Morton , Rob Herring , Greg KH , John Stultz Cc: lkml , Android Kernel Team , Greg Kroah-Hartman Subject: [PATCH v2 5/8] config: android-base: add CONFIG_IKCONFIG option Date: Thu, 8 Jun 2017 18:09:13 +0530 Message-Id: <1496925556-19417-6-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496925556-19417-1-git-send-email-amit.pundir@linaro.org> References: <1496925556-19417-1-git-send-email-amit.pundir@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 890 Lines: 29 From: Greg Kroah-Hartman 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 [AmitP: cherry-picked this change from Android common kernel] Signed-off-by: Amit Pundir --- kernel/configs/android-base.config | 2 ++ 1 file changed, 2 insertions(+) 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 -- 2.7.4