diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-08-07 13:11:14 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-08-12 13:12:00 +0800 |
| commit | f9017b715db9ac5a2ece1216117ee5185eda9f69 (patch) | |
| tree | 99e005c5e691881132fbb62362fc27b6cdecfa38 | |
| parent | 0a92c23c6ca96f6fb602be227fa4f019d3a765cd (diff) | |
ENGR00274180 android.security.cts.KernelSettingsTest#testNoConfigGz failure
Remove CONFIG_IKCONFIG_PROC as android cts requirement
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx5_android_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/imx6_android_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/imx6_hdmidongle_android_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/imx6s_android_defconfig | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/configs/imx5_android_defconfig b/arch/arm/configs/imx5_android_defconfig index 2dcfaa7013f9..f7f6210f5b98 100644 --- a/arch/arm/configs/imx5_android_defconfig +++ b/arch/arm/configs/imx5_android_defconfig @@ -73,7 +73,7 @@ CONFIG_TINY_RCU=y # CONFIG_RCU_TRACE is not set # CONFIG_TREE_RCU_TRACE is not set CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG_PROC is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig index a4a63a69c795..0a5129cff3ba 100644 --- a/arch/arm/configs/imx6_android_defconfig +++ b/arch/arm/configs/imx6_android_defconfig @@ -75,7 +75,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG_PROC is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y diff --git a/arch/arm/configs/imx6_hdmidongle_android_defconfig b/arch/arm/configs/imx6_hdmidongle_android_defconfig index 5b15040cc6fe..fc10a02edd2e 100644 --- a/arch/arm/configs/imx6_hdmidongle_android_defconfig +++ b/arch/arm/configs/imx6_hdmidongle_android_defconfig @@ -75,7 +75,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG_PROC is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y CONFIG_CGROUP_DEBUG=y diff --git a/arch/arm/configs/imx6s_android_defconfig b/arch/arm/configs/imx6s_android_defconfig index a5732193dadd..f460ae340bf2 100644 --- a/arch/arm/configs/imx6s_android_defconfig +++ b/arch/arm/configs/imx6s_android_defconfig @@ -77,7 +77,7 @@ CONFIG_RCU_FANOUT=32 # CONFIG_TREE_RCU_TRACE is not set # CONFIG_RCU_BOOST is not set CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG_PROC is not set CONFIG_LOG_BUF_SHIFT=14 CONFIG_CGROUPS=y # CONFIG_CGROUP_DEBUG is not set |