mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 05:34:13 +08:00
ALSA: pci: depend on ZONE_DMA
There are several sound drivers that 'select ZONE_DMA'. This is backwards as ZONE_DMA is an architecture capability exported to drivers. Switch the polarity of the dependency to disable these drivers when the architecture does not support ZONE_DMA. This was discovered in the context of testing/enabling devm_memremap_pages() which depends on ZONE_DEVICE. ZONE_DEVICE in turn depends on !ZONE_DMA. Reported-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
909cadc6c8
commit
2db1a57986
@ -25,7 +25,7 @@ config SND_ALS300
|
||||
select SND_PCM
|
||||
select SND_AC97_CODEC
|
||||
select SND_OPL3_LIB
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say 'Y' or 'M' to include support for Avance Logic ALS300/ALS300+
|
||||
|
||||
@ -50,7 +50,7 @@ config SND_ALI5451
|
||||
tristate "ALi M5451 PCI Audio Controller"
|
||||
select SND_MPU401_UART
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for the integrated AC97 sound
|
||||
device on motherboards using the ALi M5451 Audio Controller
|
||||
@ -155,7 +155,7 @@ config SND_AZT3328
|
||||
select SND_PCM
|
||||
select SND_RAWMIDI
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for Aztech AZF3328 (PCI168)
|
||||
soundcards.
|
||||
@ -463,7 +463,7 @@ config SND_EMU10K1
|
||||
select SND_HWDEP
|
||||
select SND_RAWMIDI
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y to include support for Sound Blaster PCI 512, Live!,
|
||||
Audigy and E-mu APS (partially supported) soundcards.
|
||||
@ -479,7 +479,7 @@ config SND_EMU10K1X
|
||||
tristate "Emu10k1X (Dell OEM Version)"
|
||||
select SND_AC97_CODEC
|
||||
select SND_RAWMIDI
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for the Dell OEM version of the
|
||||
Sound Blaster Live!.
|
||||
@ -513,7 +513,7 @@ config SND_ES1938
|
||||
select SND_OPL3_LIB
|
||||
select SND_MPU401_UART
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for soundcards based on ESS Solo-1
|
||||
(ES1938, ES1946, ES1969) chips.
|
||||
@ -525,7 +525,7 @@ config SND_ES1968
|
||||
tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
|
||||
select SND_MPU401_UART
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for soundcards based on ESS Maestro
|
||||
1/2/2E chips.
|
||||
@ -612,7 +612,7 @@ config SND_ICE1712
|
||||
select SND_MPU401_UART
|
||||
select SND_AC97_CODEC
|
||||
select BITREVERSE
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for soundcards based on the
|
||||
ICE1712 (Envy24) chip.
|
||||
@ -700,7 +700,7 @@ config SND_LX6464ES
|
||||
config SND_MAESTRO3
|
||||
tristate "ESS Allegro/Maestro3"
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for soundcards based on ESS Maestro 3
|
||||
(Allegro) chips.
|
||||
@ -806,7 +806,7 @@ config SND_SIS7019
|
||||
tristate "SiS 7019 Audio Accelerator"
|
||||
depends on X86_32
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for the SiS 7019 Audio Accelerator.
|
||||
|
||||
@ -818,7 +818,7 @@ config SND_SONICVIBES
|
||||
select SND_OPL3_LIB
|
||||
select SND_MPU401_UART
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for soundcards based on the S3
|
||||
SonicVibes chip.
|
||||
@ -830,7 +830,7 @@ config SND_TRIDENT
|
||||
tristate "Trident 4D-Wave DX/NX; SiS 7018"
|
||||
select SND_MPU401_UART
|
||||
select SND_AC97_CODEC
|
||||
select ZONE_DMA
|
||||
depends on ZONE_DMA
|
||||
help
|
||||
Say Y here to include support for soundcards based on Trident
|
||||
4D-Wave DX/NX or SiS 7018 chips.
|
||||
|
Loading…
Reference in New Issue
Block a user