Merge ../torvalds-2.6/

[pandora-kernel.git] / drivers / media / video / Kconfig

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f461750..9357035 100644 (file)
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -22,12 +22,21 @@ config VIDEO_BT848
          the Miro, Hauppauge and STB boards. Please read the material in
          <file:Documentation/video4linux/bttv/> for more information.
 
-         If you say Y or M here, you need to say Y or M to "I2C support" and
-         "I2C bit-banging interfaces" in the device drivers section.
-
          To compile this driver as a module, choose M here: the
          module will be called bttv.
 
+config VIDEO_SAA6588
+       tristate "SAA6588 Radio Chip RDS decoder support on BT848 cards"
+       depends on VIDEO_DEV && I2C && VIDEO_BT848
+
+       help
+         Support for  Radio Data System (RDS) decoder. This allows seeing
+         radio station identification transmitted using this standard.
+         Currentlly, 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 VIDEO_DEV && ISA
@@ -236,7 +245,7 @@ config VIDEO_MEYE
 
 config VIDEO_SAA7134
        tristate "Philips SAA7134 support"
-       depends on VIDEO_DEV && PCI && I2C
+       depends on VIDEO_DEV && PCI && I2C && SOUND
        select VIDEO_BUF
        select VIDEO_IR
        select VIDEO_TUNER
@@ -254,6 +263,7 @@ config VIDEO_SAA7134_DVB
        select VIDEO_BUF_DVB
        select DVB_MT352
        select DVB_CX22702
+       select DVB_TDA1004X
        ---help---
          This adds support for DVB cards based on the
          Philips saa7134 chip.
@@ -331,7 +341,7 @@ config VIDEO_CX88_DVB
        select DVB_MT352
        select DVB_OR51132
        select DVB_CX22702
-       select DVB_LGDT3302
+       select DVB_LGDT330X
        ---help---
          This adds support for DVB/ATSC cards based on the
          Connexant 2388x chip.
@@ -356,7 +366,7 @@ config VIDEO_M32R_AR
 
 config VIDEO_M32R_AR_M64278
        tristate "Use Colour AR module M64278(VGA)"
-       depends on VIDEO_M32R_AR
+       depends on VIDEO_M32R_AR && PLAT_M32700UT
        ---help---
          Say Y here to use the Renesas M64278E-800 camera module,
          which supports VGA(640x480 pixcels) size of images.