From 0526d8b334e687ada32e9e9ac9a9ecf460bd66f2 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 15 Nov 2021 18:19:44 +0100 Subject: [PATCH] ANDROID: GKI: fix up gki_defconfig to keep CONFIG_HID_PLAYSTATION Commit d7f1f9fec09a ("HID: playstation: require multicolor LED functionality") added a build dependancy for CONFIG_HID_PLAYSTATION, so add CONFIG_LEDS_CLASS_MULTICOLOR=y to the gki_defconfig files to ensure that the playstation drivers remain building as part of the gki builds. Bug: 135136477 Cc: Siarhei Vishniakou Fixes: d7f1f9fec09a ("HID: playstation: require multicolor LED functionality") Signed-off-by: Greg Kroah-Hartman Change-Id: I8e27b0f153ffd4b8d8f1c803a015b4a5103605e1 --- 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 5b44637a8066..0861758feaaa 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -504,6 +504,7 @@ CONFIG_MMC_CRYPTO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_LEDS_CLASS_FLASH=y +CONFIG_LEDS_CLASS_MULTICOLOR=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_EDAC=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 2c19fa9e155b..d0a9c5025c25 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -455,6 +455,7 @@ CONFIG_MMC_CRYPTO=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_LEDS_CLASS_FLASH=y +CONFIG_LEDS_CLASS_MULTICOLOR=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_EDAC=y