summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-01-27 01:05:56 -0500
committerTakashi Iwai <tiwai@suse.de>2016-01-27 01:10:38 -0500
commit61595dca742a9ba9a4c998b9af1f468adc816275 (patch)
treead46b13da802f5eb01c7ca60d54a31cc89e9fc18 /sound
parent07905298e4d5777eb58516cdc242f7ac1ca387a2 (diff)
ALSA: Add missing dependency on CONFIG_SND_TIMER
Since the build of PCM timer may be disabled via Kconfig now, each driver that provides a timer interface needs to set CONFIG_SND_TIMER explicitly. Otherwise it may get a build error due to missing symbol. Fixes: 90bbaf66ee7b ('ALSA: timer: add config item to export PCM timer disabling for expert') Reported-by: kbuild test robot <fengguang.wu@intel.com> Cc: <stable@vger.kernel.org> # v4.4+ Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/Kconfig4
-rw-r--r--sound/pci/Kconfig3
-rw-r--r--sound/sparc/Kconfig1
3 files changed, 8 insertions, 0 deletions
diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
index 0216475fc759..37adcc6cbe6b 100644
--- a/sound/isa/Kconfig
+++ b/sound/isa/Kconfig
@@ -3,6 +3,7 @@
3config SND_WSS_LIB 3config SND_WSS_LIB
4 tristate 4 tristate
5 select SND_PCM 5 select SND_PCM
6 select SND_TIMER
6 7
7config SND_SB_COMMON 8config SND_SB_COMMON
8 tristate 9 tristate
@@ -42,6 +43,7 @@ config SND_AD1816A
42 select SND_OPL3_LIB 43 select SND_OPL3_LIB
43 select SND_MPU401_UART 44 select SND_MPU401_UART
44 select SND_PCM 45 select SND_PCM
46 select SND_TIMER
45 help 47 help
46 Say Y here to include support for Analog Devices SoundPort 48 Say Y here to include support for Analog Devices SoundPort
47 AD1816A or compatible sound chips. 49 AD1816A or compatible sound chips.
@@ -209,6 +211,7 @@ config SND_GUSCLASSIC
209 tristate "Gravis UltraSound Classic" 211 tristate "Gravis UltraSound Classic"
210 select SND_RAWMIDI 212 select SND_RAWMIDI
211 select SND_PCM 213 select SND_PCM
214 select SND_TIMER
212 help 215 help
213 Say Y here to include support for Gravis UltraSound Classic 216 Say Y here to include support for Gravis UltraSound Classic
214 soundcards. 217 soundcards.
@@ -221,6 +224,7 @@ config SND_GUSEXTREME
221 select SND_OPL3_LIB 224 select SND_OPL3_LIB
222 select SND_MPU401_UART 225 select SND_MPU401_UART
223 select SND_PCM 226 select SND_PCM
227 select SND_TIMER
224 help 228 help
225 Say Y here to include support for Gravis UltraSound Extreme 229 Say Y here to include support for Gravis UltraSound Extreme
226 soundcards. 230 soundcards.
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 656ce39bddbc..8f6594a7d37f 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -155,6 +155,7 @@ config SND_AZT3328
155 select SND_PCM 155 select SND_PCM
156 select SND_RAWMIDI 156 select SND_RAWMIDI
157 select SND_AC97_CODEC 157 select SND_AC97_CODEC
158 select SND_TIMER
158 depends on ZONE_DMA 159 depends on ZONE_DMA
159 help 160 help
160 Say Y here to include support for Aztech AZF3328 (PCI168) 161 Say Y here to include support for Aztech AZF3328 (PCI168)
@@ -463,6 +464,7 @@ config SND_EMU10K1
463 select SND_HWDEP 464 select SND_HWDEP
464 select SND_RAWMIDI 465 select SND_RAWMIDI
465 select SND_AC97_CODEC 466 select SND_AC97_CODEC
467 select SND_TIMER
466 depends on ZONE_DMA 468 depends on ZONE_DMA
467 help 469 help
468 Say Y to include support for Sound Blaster PCI 512, Live!, 470 Say Y to include support for Sound Blaster PCI 512, Live!,
@@ -889,6 +891,7 @@ config SND_YMFPCI
889 select SND_OPL3_LIB 891 select SND_OPL3_LIB
890 select SND_MPU401_UART 892 select SND_MPU401_UART
891 select SND_AC97_CODEC 893 select SND_AC97_CODEC
894 select SND_TIMER
892 help 895 help
893 Say Y here to include support for Yamaha PCI audio chips - 896 Say Y here to include support for Yamaha PCI audio chips -
894 YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754. 897 YMF724, YMF724F, YMF740, YMF740C, YMF744, YMF754.
diff --git a/sound/sparc/Kconfig b/sound/sparc/Kconfig
index d75deba5617d..dfcd38647606 100644
--- a/sound/sparc/Kconfig
+++ b/sound/sparc/Kconfig
@@ -22,6 +22,7 @@ config SND_SUN_AMD7930
22config SND_SUN_CS4231 22config SND_SUN_CS4231
23 tristate "Sun CS4231" 23 tristate "Sun CS4231"
24 select SND_PCM 24 select SND_PCM
25 select SND_TIMER
25 help 26 help
26 Say Y here to include support for CS4231 sound device on Sun. 27 Say Y here to include support for CS4231 sound device on Sun.
27 28