* [2.6 patch] fix the SND_FM801_TEA575X dependencies
@ 2006-06-29 9:49 Adrian Bunk
2006-06-29 10:57 ` [Alsa-devel] " Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2006-06-29 9:49 UTC (permalink / raw)
To: perex; +Cc: alsa-devel, linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Alsa-devel] [2.6 patch] fix the SND_FM801_TEA575X dependencies
2006-06-29 9:49 [2.6 patch] fix the SND_FM801_TEA575X dependencies Adrian Bunk
@ 2006-06-29 10:57 ` Takashi Iwai
2006-06-29 11:10 ` Adrian Bunk
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2006-06-29 10:57 UTC (permalink / raw)
To: Adrian Bunk; +Cc: perex, alsa-devel, linux-kernel
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@stusta.de>
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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Alsa-devel] [2.6 patch] fix the SND_FM801_TEA575X dependencies
2006-06-29 10:57 ` [Alsa-devel] " Takashi Iwai
@ 2006-06-29 11:10 ` Adrian Bunk
2006-06-29 11:23 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Adrian Bunk @ 2006-06-29 11:10 UTC (permalink / raw)
To: Takashi Iwai; +Cc: perex, alsa-devel, linux-kernel
On Thu, Jun 29, 2006 at 12:57:49PM +0200, Takashi Iwai wrote:
> 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@stusta.de>
>
> Could it be a simplier one like below?
Your patch would in the case of SND_FM801=m:
- build snd-tea575x-tuner.o statically into the kernel
- set VIDEO_DEV=y
> 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
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Alsa-devel] [2.6 patch] fix the SND_FM801_TEA575X dependencies
2006-06-29 11:10 ` Adrian Bunk
@ 2006-06-29 11:23 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2006-06-29 11:23 UTC (permalink / raw)
To: Adrian Bunk; +Cc: alsa-devel, linux-kernel, perex
At Thu, 29 Jun 2006 13:10:58 +0200,
Adrian Bunk wrote:
>
> On Thu, Jun 29, 2006 at 12:57:49PM +0200, Takashi Iwai wrote:
> > 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@stusta.de>
> >
> > Could it be a simplier one like below?
>
>
> Your patch would in the case of SND_FM801=m:
> - build snd-tea575x-tuner.o statically into the kernel
> - set VIDEO_DEV=y
Ah I see. The I applied your patch to ALSA repo.
Thanks.
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-06-29 11:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-29 9:49 [2.6 patch] fix the SND_FM801_TEA575X dependencies Adrian Bunk
2006-06-29 10:57 ` [Alsa-devel] " Takashi Iwai
2006-06-29 11:10 ` Adrian Bunk
2006-06-29 11:23 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox