From bcb361424cbd3d6acd46910e8c94d5a9633ef840 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 4 Aug 2022 11:15:47 +0200 Subject: [PATCH] ANDROID: GKI: remove CONFIG_ARM_CPUIDLE=y In commit 51280acad855 ("cpuidle: cpuidle-arm: remove arm64 support") the generic ARM cpuidle option is removed as it is now properly handled by the PSCI cpuidle code. Remove this config option from the gki_defconfig to resolve the build error caused by this removal. Cc: Will Deacon Fixes: 51280acad855 ("cpuidle: cpuidle-arm: remove arm64 support") Signed-off-by: Greg Kroah-Hartman Change-Id: I92f5c31b27c25b31373ab7c9bb91ff84900d067b --- arch/arm64/configs/gki_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index ba3181a42575..626734c3835d 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -64,7 +64,6 @@ CONFIG_ENERGY_MODEL=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_IDLE_GOV_TEO=y -CONFIG_ARM_CPUIDLE=y CONFIG_ARM_PSCI_CPUIDLE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y