[patch 37/45] ALSA: fix the SND_FM801_TEA575X dependencies

Greg KH
2006-07-17T16:37:28Z

[-- Attachment #1: alsa-fix-the-snd_fm801_tea575x-dependencies.patch --]
[-- Type: text/plain, Size: 2252 bytes --]

-stable review patch. If anyone has any objections, please let us know.

------------------
From: Takashi Iwai <tiwai@suse.de>

[PATCH] ALSA: fix the SND_FM801_TEA575X dependencies

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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

--- linux-2.6.17.6.orig/sound/pci/Kconfig
+++ linux-2.6.17.6/sound/pci/Kconfig
@@ -318,17 +318,19 @@ config SND_FM801
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.6.orig/sound/pci/fm801.c
+++ linux-2.6.17.6/sound/pci/fm801.c
@@ -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

--