projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: serial: ftdi_sio: fix modem-status error handling
[firefly-linux-kernel-4.4.55.git]
/
sound
/
pci
/
Kconfig
diff --git
a/sound/pci/Kconfig
b/sound/pci/Kconfig
index edfc1b8d553ee3c6e1ad4bfd4d424fce7631b292..8f6594a7d37f7b940ded27f6a8a0395ea8fa1442 100644
(file)
--- a/
sound/pci/Kconfig
+++ b/
sound/pci/Kconfig
@@
-25,7
+25,7
@@
config SND_ALS300
select SND_PCM
select SND_AC97_CODEC
select SND_OPL3_LIB
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+
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
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
help
Say Y here to include support for the integrated AC97 sound
device on motherboards using the ALi M5451 Audio Controller
@@
-155,7
+155,8
@@
config SND_AZT3328
select SND_PCM
select SND_RAWMIDI
select SND_AC97_CODEC
select SND_PCM
select SND_RAWMIDI
select SND_AC97_CODEC
- select ZONE_DMA
+ select SND_TIMER
+ depends on ZONE_DMA
help
Say Y here to include support for Aztech AZF3328 (PCI168)
soundcards.
help
Say Y here to include support for Aztech AZF3328 (PCI168)
soundcards.
@@
-463,7
+464,8
@@
config SND_EMU10K1
select SND_HWDEP
select SND_RAWMIDI
select SND_AC97_CODEC
select SND_HWDEP
select SND_RAWMIDI
select SND_AC97_CODEC
- select ZONE_DMA
+ select SND_TIMER
+ depends on ZONE_DMA
help
Say Y to include support for Sound Blaster PCI 512, Live!,
Audigy and E-mu APS (partially supported) soundcards.
help
Say Y to include support for Sound Blaster PCI 512, Live!,
Audigy and E-mu APS (partially supported) soundcards.
@@
-479,7
+481,7
@@
config SND_EMU10K1X
tristate "Emu10k1X (Dell OEM Version)"
select SND_AC97_CODEC
select SND_RAWMIDI
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!.
help
Say Y here to include support for the Dell OEM version of the
Sound Blaster Live!.
@@
-513,7
+515,7
@@
config SND_ES1938
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
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.
help
Say Y here to include support for soundcards based on ESS Solo-1
(ES1938, ES1946, ES1969) chips.
@@
-525,7
+527,7
@@
config SND_ES1968
tristate "ESS ES1968/1978 (Maestro-1/2/2E)"
select SND_MPU401_UART
select SND_AC97_CODEC
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.
help
Say Y here to include support for soundcards based on ESS Maestro
1/2/2E chips.
@@
-612,7
+614,7
@@
config SND_ICE1712
select SND_MPU401_UART
select SND_AC97_CODEC
select BITREVERSE
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.
help
Say Y here to include support for soundcards based on the
ICE1712 (Envy24) chip.
@@
-700,7
+702,7
@@
config SND_LX6464ES
config SND_MAESTRO3
tristate "ESS Allegro/Maestro3"
select SND_AC97_CODEC
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.
help
Say Y here to include support for soundcards based on ESS Maestro 3
(Allegro) chips.
@@
-806,7
+808,7
@@
config SND_SIS7019
tristate "SiS 7019 Audio Accelerator"
depends on X86_32
select SND_AC97_CODEC
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.
help
Say Y here to include support for the SiS 7019 Audio Accelerator.
@@
-818,7
+820,7
@@
config SND_SONICVIBES
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
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.
help
Say Y here to include support for soundcards based on the S3
SonicVibes chip.
@@
-830,7
+832,7
@@
config SND_TRIDENT
tristate "Trident 4D-Wave DX/NX; SiS 7018"
select SND_MPU401_UART
select SND_AC97_CODEC
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.
help
Say Y here to include support for soundcards based on Trident
4D-Wave DX/NX or SiS 7018 chips.
@@
-889,6
+891,7
@@
config SND_YMFPCI
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
select SND_OPL3_LIB
select SND_MPU401_UART
select SND_AC97_CODEC
+ select SND_TIMER
help
Say Y here to include support for Yamaha PCI audio chips -
YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.
help
Say Y here to include support for Yamaha PCI audio chips -
YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.