projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cbd1d90)
Revert "arm64: rockchip_defconfig: enable CONFIG_IKCONFIG"
authorHuang, Tao <huangtao@rock-chips.com>
Mon, 15 May 2017 08:05:00 +0000 (16:05 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Mon, 15 May 2017 08:11:44 +0000 (16:11 +0800)
This reverts commit 28f4152aad7fc402f6f545f07f4193aac7a05087.

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

Change-Id: I9bd7d4c6c06b7d43fa51a7f02eecca8cedc61c1d
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
arch/arm64/configs/rockchip_defconfig patch | blob | history

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 305f14c7020c007e4f786df380fae8e49f68c764..edc020547afe9a79ba2e705d67035b6a5d2771d6 100644 (file)
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -8,8 +8,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.