From: Huang, Tao <huangtao@rock-chips.com>
Date: Mon, 15 May 2017 08:01:40 +0000 (+0800)
Subject: Revert "ARM: rockchip_defconfig: enable CONFIG_IKCONFIG"
X-Git-Tag: release-20171130_firefly~4^2~572
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cbd1d90f723ab029e3326c0e085ea050691294ec;p=firefly-linux-kernel-4.4.55.git

Revert "ARM: rockchip_defconfig: enable CONFIG_IKCONFIG"

This reverts commit b90c069d1edf02a11533cf6ba401316e36b6702b.

For pass Android 7.1 CTS:
android.security.cts.KernelSettingsTest#testNoConfigGz

Change-Id: Ia45a95bbb9aafaf0b38b7bd4647f20878403eaae
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 687c0b08ef9d..dcfd89d3518c 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -9,8 +9,6 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y