From 1e702f432d551041753c46ec0d6d49484e776441 Mon Sep 17 00:00:00 2001 From: Ram Muthiah Date: Mon, 2 Mar 2020 16:28:03 -0800 Subject: [PATCH] ANDROID: GKI: Added missing SND configs Bug: 150620456 Test: Treehugger Signed-off-by: Ram Muthiah Change-Id: I809392ffe06327839be7574195b1f080db2d1f2e --- arch/x86/configs/gki_defconfig | 3 ++- init/Kconfig.gki | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index a04b9ed277a2..30e6782c8dc4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -281,7 +281,8 @@ CONFIG_SND_DYNAMIC_MINORS=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set # CONFIG_SND_DRIVERS is not set -# CONFIG_SND_USB is not set +CONFIG_SND_USB_AUDIO=y +CONFIG_SND_SOC=y CONFIG_HIDRAW=y CONFIG_UHID=y CONFIG_HID_APPLE=y diff --git a/init/Kconfig.gki b/init/Kconfig.gki index ae1457d07e78..572499005bf6 100644 --- a/init/Kconfig.gki +++ b/init/Kconfig.gki @@ -33,6 +33,8 @@ config GKI_HIDDEN_SND_CONFIGS bool "Hidden SND configs needed for GKI" select SND_VMASTER select SND_PCM_ELD + select SND_JACK + select SND_JACK_INPUT_DEV select SND_INTEL_NHLT if (ACPI) help Dummy config option used to enable hidden SND configs.