summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang, Tao <huangtao@rock-chips.com>2017-05-15 16:01:40 +0800
committerHuang, Tao <huangtao@rock-chips.com>2017-05-15 16:03:41 +0800
commitcbd1d90f723ab029e3326c0e085ea050691294ec (patch)
treee23b6ddedc1bced642c0e6bb0aa6f1a0835ea2f5
parentc95e3c20869413cc0d170cf5c1334e103b28fc2a (diff)
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>
-rw-r--r--arch/arm/configs/rockchip_defconfig2
1 files changed, 0 insertions, 2 deletions
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