Skip to contentSkip to conversation

fix the SND_FM801_TEA575X dependencies

PATCH In review Adrian Bunk 2 participants 5 messages Jun 29, 2006 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 sound/pci/Kconfig |   14 ++++++++------
 sound/pci/fm801.c |    2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)
sound/pci/Kconfig renamed from sound/pci/Kconfig.old +8 -6
@@ -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"
sound/pci/fm801.c renamed from sound/pci/fm801.c.old +1 -1
@@ -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

#1 lore raw

At Thu, 29 Jun 2006 11:49:44 +0200,

Quoted 14 lines · Adrian Bunk

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

Quoted 5 lines

<-- snip -->

This patch fixes kernel Bugzilla #6458.

Could it be a simplier one like below?

Takashi

sound/pci/Kconfig +1 -4
diff -r cd7256009b28 sound/pci/Kconfig
@@ -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"
sound/pci/fm801.c +1 -1
diff -r cd7256009b28 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
 #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

#2 lore raw
Quoted 16 lines · Takashi Iwai

At Thu, 29 Jun 2006 11:49:44 +0200,

Quoted 14 lines · Adrian Bunk

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

Quoted 7 lines
Quoted 5 lines

<-- snip -->

This patch fixes kernel Bugzilla #6458.

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

Quoted 28 lines

Takashi

diff -r cd7256009b28 sound/pci/Kconfig

sound/pci/Kconfig +1 -4
@@ -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

sound/pci/fm801.c line 41

Quoted 8 lines
sound/pci/fm801.c +1 -1
@@ -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

Signature · 10 lines
       "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


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
#3 lore raw

At Thu, 29 Jun 2006 13:10:58 +0200,

Quoted 22 lines · Adrian Bunk
Quoted 20 lines · Takashi Iwai

At Thu, 29 Jun 2006 11:49:44 +0200,

Quoted 18 lines · Adrian Bunk

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.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

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

#4 lore raw
In reply to Adrian Bunk

At Thu, 29 Jun 2006 13:10:58 +0200,

Quoted 22 lines · Adrian Bunk
Quoted 20 lines · Takashi Iwai

At Thu, 29 Jun 2006 11:49:44 +0200,

Quoted 18 lines · Adrian Bunk

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.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

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

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