aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-12-08 12:13:07 -0500
committerTakashi Iwai <tiwai@suse.de>2009-12-08 12:18:01 -0500
commitdd7cdb883b1000cb2be537c44612ade3c9c39a7b (patch)
treefea59c0cbfa3ac7e95a17935f37cdb12f8c11c73
parent2b6f6c0d11fcf6244b98d2b7490164d92d3e409f (diff)
ALSA: radio/sound/miro: fix build, cleanup depends/selects
miropcm20 uses ALSA (snd_) interfaces from the SND_MIRO driver, so it should depend on SND. (selecting SND_MIRO when CONFIG_SND is not enabled is a problem.) drivers/built-in.o: In function `vidioc_s_ctrl': radio-miropcm20.c:(.text+0x227499): undefined reference to `snd_aci_cmd' drivers/built-in.o: In function `vidioc_s_frequency': radio-miropcm20.c:(.text+0x227574): undefined reference to `snd_aci_cmd' radio-miropcm20.c:(.text+0x227588): undefined reference to `snd_aci_cmd' drivers/built-in.o: In function `pcm20_init': radio-miropcm20.c:(.init.text+0x2a784): undefined reference to `snd_aci_get_aci' miropcm20 selects SND_MIRO but SND_ISA may be not enabled, so also select SND_ISA so that the snd-miro driver will be built. Otherwise there are missing symbols: ERROR: "snd_opl4_create" [sound/isa/opti9xx/snd-miro.ko] undefined! ERROR: "snd_wss_pcm" [sound/isa/opti9xx/snd-miro.ko] undefined! ERROR: "snd_wss_timer" [sound/isa/opti9xx/snd-miro.ko] undefined! ERROR: "snd_wss_create" [sound/isa/opti9xx/snd-miro.ko] undefined! ERROR: "snd_wss_mixer" [sound/isa/opti9xx/snd-miro.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--drivers/media/radio/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index b134553eb3b5..dcc7af2f3319 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -197,7 +197,8 @@ config RADIO_MAESTRO
197 197
198config RADIO_MIROPCM20 198config RADIO_MIROPCM20
199 tristate "miroSOUND PCM20 radio" 199 tristate "miroSOUND PCM20 radio"
200 depends on ISA && VIDEO_V4L2 200 depends on ISA && VIDEO_V4L2 && SND
201 select SND_ISA
201 select SND_MIRO 202 select SND_MIRO
202 ---help--- 203 ---help---
203 Choose Y here if you have this FM radio card. You also need to enable 204 Choose Y here if you have this FM radio card. You also need to enable