projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c95e3c2)
Revert "ARM: rockchip_defconfig: enable CONFIG_IKCONFIG"
authorHuang, Tao <huangtao@rock-chips.com>
Mon, 15 May 2017 08:01:40 +0000 (16:01 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 15 May 2017 08:03:41 +0000 (16:03 +0800)
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>
arch/arm/configs/rockchip_defconfig patch | blob | history

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 687c0b08ef9d94d3835ae58df2ed4ab4be8d1ae7..dcfd89d3518c4d772cffc75fca8ed875ad4d61c0 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.