From efce4bb9ecd033c9e0f221549be0098bcf6a3aad Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 29 Jun 2006 13:22:29 +0200 Subject: [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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/pci/Kconfig | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sound/pci/Kconfig') diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 23e54cedfd4..9951bff0d30 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -460,17 +460,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" -- cgit v1.2.3 From c775ac76e8127ce0653162f04c9672402d579b65 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 29 Jun 2006 16:12:30 +0200 Subject: [ALSA] sound/pci/Kconfig - fix broken indenting for SND_FM801_TEA575X Signed-off-by: Jaroslav Kysela --- sound/pci/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sound/pci/Kconfig') diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig index 9951bff0d30..d7ad32f514d 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@ -469,10 +469,10 @@ config SND_FM801_TEA575X_BOOL Forte SF256-PCS-02) into the snd-fm801 driver. config SND_FM801_TEA575X - tristate - depends on SND_FM801_TEA575X_BOOL - default SND_FM801 - select VIDEO_DEV + tristate + depends on SND_FM801_TEA575X_BOOL + default SND_FM801 + select VIDEO_DEV config SND_HDA_INTEL tristate "Intel HD Audio" -- cgit v1.2.3