Skip to content

Commit f1685af

Browse files
arndbarndb
committed
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: 25540f6 ("ASoC: pxa: change ac97 dependencies") Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 1a4aacd commit f1685af

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

‎arch/arm/configs/pxa_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ CONFIG_SND_PCM_OSS=m
482482
CONFIG_SND_DYNAMIC_MINORS=y
483483
CONFIG_SND_VERBOSE_PRINTK=y
484484
CONFIG_SND_DEBUG=y
485-
CONFIG_SND_PXA2XX_AC97=m
486485
CONFIG_SND_USB_AUDIO=m
487486
CONFIG_SND_SOC=m
488487
CONFIG_SND_ATMEL_SOC=m

0 commit comments

Comments
 (0)