From f1685af78cc8d31a5563f2944de0936eb6923f4b Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 19 Feb 2019 15:51:57 +0100 Subject: ARM: pxa: remove CONFIG_SND_PXA2XX_AC97 in pxa_defconfig The CONFIG_SND_PXA2XX_AC97 driver is for the old AC97 bus implementation, and conflicts with all the new-style AC97 drivers after the conversion, so the drivers we want all get turned off. Not disabling the symbol however does the right thing, and we get the drivers that are selectively enabled here. Fixes: 25540f68c871 ("ASoC: pxa: change ac97 dependencies") Acked-by: Robert Jarzmik Signed-off-by: Arnd Bergmann --- arch/arm/configs/pxa_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/configs/pxa_defconfig') diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig index 6bb506edb1f5..7f0f1fda2584 100644 --- a/arch/arm/configs/pxa_defconfig +++ b/arch/arm/configs/pxa_defconfig @@ -482,7 +482,6 @@ CONFIG_SND_PCM_OSS=m CONFIG_SND_DYNAMIC_MINORS=y CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y -CONFIG_SND_PXA2XX_AC97=m CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=m CONFIG_SND_ATMEL_SOC=m -- cgit v1.2.3-59-g8ed1b