lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] fix the SND_FM801_TEA575X dependencies

Browse Source 
CONFIG_SND_FM801=y, CONFIG_SND_FM801_TEA575X=m resulted in the following
compile error:
<--  snip  -->
...
  LD      vmlinux
sound/built-in.o: In function 'snd_fm801_free':
fm801.c:(.text+0x3c15b): undefined reference to 'snd_tea575x_exit'
sound/built-in.o: In function 'snd_card_fm801_probe':
fm801.c:(.text+0x3cfde): undefined reference to 'snd_tea575x_init'
make: *** [vmlinux] Error 1
<--  snip  -->
This patch fixes kernel Bugzilla #6458.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Adrian Bunk
2006-06-29 13:22:29 +02:00
committed by Jaroslav Kysela
parent cb6dd26097
commit efce4bb9ec
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sound/pci/Kconfig
View File

@@ -460,17 +460,19 @@ config SND_FM801
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called snd-fm801. will be called snd-fm801.
config SND_FM801_TEA575X config SND_FM801_TEA575X_BOOL
tristate "ForteMedia FM801 + TEA5757 tuner" bool "ForteMedia FM801 + TEA5757 tuner"
depends on SND_FM801 depends on SND_FM801
select VIDEO_DEV
help help
Say Y here to include support for soundcards based on the ForteMedia Say Y here to include support for soundcards based on the ForteMedia
FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
Forte SF256-PCS-02). Forte SF256-PCS-02) into the snd-fm801 driver.
To compile this driver as a module, choose M here: the module config SND_FM801_TEA575X
will be called snd-fm801-tea575x. tristate
depends on SND_FM801_TEA575X_BOOL
default SND_FM801
select VIDEO_DEV
config SND_HDA_INTEL config SND_HDA_INTEL
tristate "Intel HD Audio" tristate "Intel HD Audio"

2
sound/pci/fm801.c
View File

@@ -35,7 +35,7 @@
#include <asm/io.h> #include <asm/io.h>
#if (defined(CONFIG_SND_FM801_TEA575X) || defined(CONFIG_SND_FM801_TEA575X_MODULE)) && (defined(CONFIG_VIDEO_DEV) || defined(CONFIG_VIDEO_DEV_MODULE)) #ifdef CONFIG_SND_FM801_TEA575X_BOOL
#include <sound/tea575x-tuner.h> #include <sound/tea575x-tuner.h>
#define TEA575X_RADIO 1 #define TEA575X_RADIO 1
#endif #endif