[2.6 patch] fix the SND_FM801_TEA575X dependencies

[Adrian Bunk <bunk@stusta.de>]

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>

---

 sound/pci/Kconfig |   14 ++++++++------
 sound/pci/fm801.c |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

--- linux-2.6.17-mm3-full/sound/pci/Kconfig.old	2006-06-28 18:47:02.000000000 +0200
+++ linux-2.6.17-mm3-full/sound/pci/Kconfig	2006-06-28 19:03:58.000000000 +0200
@@ -323,17 +323,19 @@
 	  To compile this driver as a module, choose M here: the module
 	  will be called snd-fm801.
 
-config SND_FM801_TEA575X
-	tristate "ForteMedia FM801 + TEA5757 tuner"
+config SND_FM801_TEA575X_BOOL
+	bool "ForteMedia FM801 + TEA5757 tuner"
 	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).
+	  Forte SF256-PCS-02) into the snd-fm801 driver.
 
-	  To compile this driver as a module, choose M here: the module
-	  will be called snd-fm801-tea575x.
+config SND_FM801_TEA575X
+       tristate
+       depends on SND_FM801_TEA575X_BOOL
+       default SND_FM801
+       select VIDEO_DEV
 
 config SND_HDA_INTEL
 	tristate "Intel HD Audio"
--- linux-2.6.17-mm3-full/sound/pci/fm801.c.old	2006-06-28 18:50:29.000000000 +0200
+++ linux-2.6.17-mm3-full/sound/pci/fm801.c	2006-06-28 19:05:35.000000000 +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_BOOL
 #include <sound/tea575x-tuner.h>
 #define TEA575X_RADIO 1
 #endif


Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642