From e15f370e91366cfc36bd069fabf4ff85acf18f9b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 10 Mar 2020 13:58:46 +0100 Subject: [PATCH] ANDROID: enable CONFIG_WATCHDOG_CORE=y WATCHDOG was enabled, but we forgot about the watchdog core code, so turn it on as well so that all vendors do not have to enable it in their configs. Reported-by: Orson Zhai Signed-off-by: Greg Kroah-Hartman Change-Id: Iac14e304b15f774d52fb07aa65df86f3dd71797f --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 4d37caecb376..465d9bf4ef56 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -310,6 +310,7 @@ CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_CPU_THERMAL=y CONFIG_DEVFREQ_THERMAL=y CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y CONFIG_MFD_ACT8945A=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b0236103daf8..3493977748af 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -267,6 +267,7 @@ CONFIG_GPIOLIB=y CONFIG_DEVFREQ_THERMAL=y # CONFIG_X86_PKG_TEMP_THERMAL is not set CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y