Re: [Alsa-devel] [2.6 patch] fix the SND_FM801_TEA575X dependencies

[Takashi Iwai]

At Thu, 29 Jun 2006 11:49:44 +0200,
Adrian Bunk wrote:
> 
> 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@xxxxxxxxx>

Could it be a simplier one like below?


Takashi


diff -r cd7256009b28 sound/pci/Kconfig
--- a/sound/pci/Kconfig	Wed Jun 28 16:39:36 2006 +0200
+++ b/sound/pci/Kconfig	Thu Jun 29 12:54:08 2006 +0200
@@ -461,16 +461,13 @@ config SND_FM801
 	  will be called snd-fm801.
 
 config SND_FM801_TEA575X
-	tristate "ForteMedia FM801 + TEA5757 tuner"
+	bool "TEA5757 tuner support on ForteMedia FM801"
 	depends on SND_FM801
         select VIDEO_DEV
 	help
 	  Say Y here to include support for soundcards based on the ForteMedia
 	  FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
 	  Forte SF256-PCS-02).
-
-	  To compile this driver as a module, choose M here: the module
-	  will be called snd-fm801-tea575x.
 
 config SND_HDA_INTEL
 	tristate "Intel HD Audio"
diff -r cd7256009b28 sound/pci/fm801.c
--- a/sound/pci/fm801.c	Wed Jun 28 16:39:36 2006 +0200
+++ b/sound/pci/fm801.c	Thu Jun 29 12:54:08 2006 +0200
@@ -35,7 +35,7 @@
 
 #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
 #include <sound/tea575x-tuner.h>
 #define TEA575X_RADIO 1
 #endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/