V4L/DVB (11281): bttv: move saa6588 config to the helper chip config

saa6588 can also be used by other drivers than just bttv. Move it to a
new RDS decoders category and add it as helper chip to bttv.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 15 insertions, 12 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 3f85b9e63754..76bad5819592 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -249,6 +249,20 @@ config VIDEO_VP27SMPX
           To compile this driver as a module, choose M here: the
           module will be called vp27smpx.
 
+comment "RDS decoders"
+
+config VIDEO_SAA6588
+        tristate "SAA6588 Radio Chip RDS decoder support"
+        depends on VIDEO_V4L2 && I2C
+
+        help
+          Support for this Radio Data System (RDS) decoder. This allows
+          seeing radio station identification transmitted using this
+          standard.
+
+          To compile this driver as a module, choose M here: the
+          module will be called saa6588.
+
 comment "Video decoders"
 
 config VIDEO_BT819
@@ -467,18 +481,6 @@ config VIDEO_VIVI
 
 source "drivers/media/video/bt8xx/Kconfig"
 
-config VIDEO_SAA6588
-        tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
-        depends on I2C && VIDEO_BT848
-
-        help
-          Support for  Radio Data System (RDS) decoder. This allows seeing
-          radio station identification transmitted using this standard.
-          Currently, it works only with bt8x8 chips.
-
-          To compile this driver as a module, choose M here: the
-          module will be called saa6588.
-
 config VIDEO_PMS
         tristate "Mediavision Pro Movie Studio Video For Linux"
         depends on ISA && VIDEO_V4L1
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 94c9df8b1158..3077c45015f5 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -10,6 +10,7 @@ config VIDEO_BT848
         select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO
         select VIDEO_TDA7432 if VIDEO_HELPER_CHIPS_AUTO
+        select VIDEO_SAA6588 if VIDEO_HELPER_CHIPS_AUTO
         ---help---
           Support for BT848 based frame grabber/overlay boards. This includes
           the Miro, Hauppauge and STB boards. Please read the material in