From d64472355f6a2107b81a8426b826d0b47b1147cf Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Mon, 15 Apr 2024 14:57:47 +0100 Subject: [PATCH] ANDROID: gki_defconfig: Remove non-existent option THERMAL_WRITABLE_TRIPS Commit a85739c8c689 ("thermal: Get rid of CONFIG_THERMAL_WRITABLE_TRIPS") removed the THERMAL_WRITABLE_TRIPS option entirely. Reflect that in our supported defconfigs. Fixes: a85739c8c689 ("thermal: Get rid of CONFIG_THERMAL_WRITABLE_TRIPS") Signed-off-by: Lee Jones Change-Id: I26b0db44134ea8325c78ec0c233a3ec58557ff80 --- arch/arm64/configs/gki_defconfig | 1 - arch/x86/configs/gki_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 9aaabbe1e002..d28fb2471ad9 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -416,7 +416,6 @@ CONFIG_THERMAL=y CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100 -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 2c24d0e2a993..1be194f28831 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -388,7 +388,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=100 -CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_THERMAL_GOV_BANG_BANG=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y