2 files changed, 9 insertions, 7 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 23e54cedfd4a..9951bff0d302 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"
diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 3aed27eace2c..0b782e1e12f8 100644
--- a/sound/pci/fm801.c
+++ b/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