From 54eaf08e969a60d35f89d7fc448f74c9256b0d50 Mon Sep 17 00:00:00 2001 From: wangwang Date: Thu, 14 Nov 2019 17:05:25 +0800 Subject: [PATCH] Revert "(CR) psi:kernel:enable PSI configuration" This reverts commit 9ea0893bec0beb7328429c222097427d33981714. Conflicts: arch/arm64/configs/ext_config/moto-erd9610.config Change-Id: I8e2c88a7b2c932fa877416564d5cbf294afe0d5a Reviewed-on: https://gerrit.mot.com/1455315 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- arch/arm64/configs/ext_config/moto-erd9610.config | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/configs/ext_config/moto-erd9610.config b/arch/arm64/configs/ext_config/moto-erd9610.config index 1bf473f61c79..4eb078958c56 100644 --- a/arch/arm64/configs/ext_config/moto-erd9610.config +++ b/arch/arm64/configs/ext_config/moto-erd9610.config @@ -60,7 +60,6 @@ CONFIG_SCSC_WLAN_ABNORMAL_MULTICAST_PKT_FILTER=y CONFIG_BLK_DEV_LOOP=y # pre-create 16 loop devices CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 -# enable ulmkd for PSI -CONFIG_PSI=y CONFIG_LOCALVERSION="-user" # CONFIG_LOCALVERSION_AUTO is not set +# -- 2.20.1