ALSA: ISA: not for M68K
[ Upstream commit 3c05f1477e
]
On m68k, compiling drivers under SND_ISA causes build errors:
../sound/core/isadma.c: In function 'snd_dma_program':
../sound/core/isadma.c:33:17: error: implicit declaration of function 'claim_dma_lock' [-Werror=implicit-function-declaration]
33 | flags = claim_dma_lock();
| ^~~~~~~~~~~~~~
../sound/core/isadma.c:41:9: error: implicit declaration of function 'release_dma_lock' [-Werror=implicit-function-declaration]
41 | release_dma_lock(flags);
| ^~~~~~~~~~~~~~~~
../sound/isa/sb/sb16_main.c: In function 'snd_sb16_playback_prepare':
../sound/isa/sb/sb16_main.c:253:72: error: 'DMA_AUTOINIT' undeclared (first use in this function)
253 | snd_dma_program(dma, runtime->dma_addr, size, DMA_MODE_WRITE | DMA_AUTOINIT);
| ^~~~~~~~~~~~
../sound/isa/sb/sb16_main.c:253:72: note: each undeclared identifier is reported only once for each function it appears in
../sound/isa/sb/sb16_main.c: In function 'snd_sb16_capture_prepare':
../sound/isa/sb/sb16_main.c:322:71: error: 'DMA_AUTOINIT' undeclared (first use in this function)
322 | snd_dma_program(dma, runtime->dma_addr, size, DMA_MODE_READ | DMA_AUTOINIT);
| ^~~~~~~~~~~~
and more...
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: alsa-devel@alsa-project.org
Cc: linux-m68k@lists.linux-m68k.org
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20211016062602.3588-1-rdunlap@infradead.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
eadee7f95b
Коммит
0a2ddbfd65
|
@ -9,7 +9,9 @@ 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
|
||||
|
|
|
@ -22,7 +22,7 @@ config SND_SB16_DSP
|
|||
menuconfig SND_ISA
|
||||
bool "ISA sound devices"
|
||||
depends on ISA || COMPILE_TEST
|
||||
depends on ISA_DMA_API
|
||||
depends on ISA_DMA_API && !M68K
|
||||
default y
|
||||
help
|
||||
Support for sound devices connected via the ISA bus.
|
||||
|
|
|
@ -279,6 +279,7 @@ config SND_CS46XX_NEW_DSP
|
|||
config SND_CS5530
|
||||
tristate "CS5530 Audio"
|
||||
depends on ISA_DMA_API && (X86_32 || COMPILE_TEST)
|
||||
depends on !M68K
|
||||
select SND_SB16_DSP
|
||||
help
|
||||
Say Y here to include support for audio on Cyrix/NatSemi CS5530 chips.
|
||||
|
|
Загрузка…
Ссылка в новой задаче