aboutsummaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorGravatar Takashi Iwai <tiwai@suse.de> 2022-07-04 14:14:04 +0200
committerGravatar Takashi Iwai <tiwai@suse.de> 2022-07-04 14:14:04 +0200
commitdd84cfff3cc3b79c9d616f85bd1178df135cbd1a (patch)
treecd02e30a78211bed4f1270877b705a079d4bd364 /sound/core
parentALSA: usb-audio: Add quirk for Fiero SC-01 (fw v1.0.0) (diff)
parentASoC: madera: Fix event generation for rate controls (diff)
downloadlinux-dd84cfff3cc3b79c9d616f85bd1178df135cbd1a.tar.gz
linux-dd84cfff3cc3b79c9d616f85bd1178df135cbd1a.tar.bz2
linux-dd84cfff3cc3b79c9d616f85bd1178df135cbd1a.zip
Merge tag 'asoc-fix-v5.19-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.19 A collection of fixes for v5.19, quite large but nothing major - a good chunk of it is more stuff that was identified by mixer-test regarding event generation.
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/core/Makefile b/sound/core/Makefile
index 350d704ced98..2762f03d9b7b 100644
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
@@ -9,9 +9,7 @@ ifneq ($(CONFIG_SND_PROC_FS),)
snd-y += info.o
snd-$(CONFIG_SND_OSSEMUL) += info_oss.o
endif
-ifneq ($(CONFIG_M68K),y)
snd-$(CONFIG_ISA_DMA_API) += isadma.o
-endif
snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o
snd-$(CONFIG_SND_VMASTER) += vmaster.o
snd-$(CONFIG_SND_JACK) += ctljack.o jack.o